actually create one MVar per DB context ...

cardano-foundation · Dec 16, 2019 · 4639180 · 4639180
1 parent 159c9f4
commit 4639180
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/lib/core/src/Cardano/Wallet/DB/Sqlite.hs b/lib/core/src/Cardano/Wallet/DB/Sqlite.hs
@@ -92,7 +92,7 @@ import Cardano.Wallet.Primitive.AddressDiscovery
 import Control.Arrow
     ( (***) )
 import Control.Concurrent.MVar
-    ( newEmptyMVar, putMVar, readMVar )
+    ( modifyMVar_, newMVar )
 import Control.DeepSeq
     ( NFData )
 import Control.Exception
@@ -111,6 +111,8 @@ import Data.Coerce
     ( coerce )
 import Data.Either
     ( isRight )
+import Data.Functor
+    ( ($>) )
 import Data.Generics.Internal.VL.Lens
     ( (^.) )
 import Data.List.Split
@@ -220,7 +222,7 @@ newDBFactory
        -- ^ Path to database directory, or Nothing for in-memory database
     -> IO (DBFactory IO s k)
 newDBFactory cfg tr mDatabaseDir = do
-    mvar <- newEmptyMVar
+    mvar <- newMVar mempty
     case mDatabaseDir of
         Nothing -> pure DBFactory
             { withDatabase = \_ action ->
@@ -229,17 +231,20 @@ newDBFactory cfg tr mDatabaseDir = do
                 pure ()
             }
         Just databaseDir -> pure DBFactory
-            { withDatabase = \wid action ->
-                withDBLayer cfg tracerDB (Just $ databaseFile wid) $ \(ctx,db) -> do
-                    putMVar mvar ctx
-                    action db
+            { withDatabase = \wid action -> do
+                withDBLayer cfg tracerDB (Just $ databaseFile wid)
+                    $ \(ctx, db) -> do
+                        modifyMVar_ mvar (pure . Map.insert wid ctx)
+                        action db
             , removeDatabase = \wid -> do
                 let files =
                         [ databaseFile wid
                         , databaseFile wid <> "-wal"
                         , databaseFile wid <> "-shm"
                         ]
-                readMVar mvar >>= destroyDBLayer
+                modifyMVar_ mvar $ \m -> case Map.lookup wid m of
+                    Nothing -> pure m
+                    Just ctx -> destroyDBLayer ctx $> Map.delete wid m
                 mapM_ removePathForcibly files
             }
           where

diff --git a/lib/core/test/unit/Cardano/Wallet/DB/SqliteSpec.hs b/lib/core/test/unit/Cardano/Wallet/DB/SqliteSpec.hs
@@ -113,6 +113,8 @@ import Cardano.Wallet.Unsafe
     ( unsafeRunExceptT )
 import Control.Concurrent
     ( forkIO )
+import Control.Concurrent.MVar
+    ( newEmptyMVar, takeMVar, tryPutMVar )
 import Control.DeepSeq
     ( NFData )
 import Control.Exception
@@ -356,15 +358,18 @@ fileModeSpec =  do
             withSystemTempDirectory "DBFactory" $ \dir -> do
                 cfg <- defaultConfigTesting
                 DBFactory{..} <- newDBFactory cfg nullTracer (Just dir)
+                mvar <- newEmptyMVar
 
                 -- NOTE
                 -- Start a concurrent worker which makes action on the DB in
                 -- parallel to simulate activity.
                 _ <- forkIO $ withDatabase testWid $ \(DBLayer{..} :: TestDBSeq) -> do
                     forever $ do
                         cp <- atomically $ readCheckpoint $ PrimaryKey testWid
+                        _ <- tryPutMVar mvar ()
                         B8.putStrLn (B8.pack $ show cp)
 
+                takeMVar mvar
                 removeDatabase testWid
                 listDirectory dir `shouldReturn` mempty