move TransferrerPool from Assistant state to Annex state

This commit was sponsored by Graham Spencer on Patreon.

1 files changed, 10 insertions, 11 deletions

diff --git a/Types/TransferrerPool.hs b/Types/TransferrerPool.hs
index e6019f27f0..72d61a3b9a 100644
--- a/Types/TransferrerPool.hs
+++ b/Types/TransferrerPool.hs
@@ -7,11 +7,11 @@
 
 module Types.TransferrerPool where
 
-import Annex.Common
+import Common
 
 import Control.Concurrent.STM hiding (check)
 
-type TransferrerPool = TVar (MkCheckTransferrer, [TransferrerPoolItem])
+type TransferrerPool = TVar [TransferrerPoolItem]
 
 type CheckTransferrer = IO Bool
 type MkCheckTransferrer = IO (IO Bool)
@@ -27,30 +27,29 @@ data Transferrer = Transferrer
 	, transferrerHandle :: ProcessHandle
 	}
 
-newTransferrerPool :: MkCheckTransferrer -> IO TransferrerPool
-newTransferrerPool c = newTVarIO (c, [])
+newTransferrerPool :: IO TransferrerPool
+newTransferrerPool = newTVarIO []
 
 popTransferrerPool :: TransferrerPool -> STM (Maybe TransferrerPoolItem, Int)
 popTransferrerPool p = do
-	(c, l) <- readTVar p
+	l <- readTVar p
 	case l of
 		[] -> return (Nothing, 0)
 		(i:is) -> do
-			writeTVar p (c, is)
+			writeTVar p is
 			return $ (Just i, length is)
 
 pushTransferrerPool :: TransferrerPool -> TransferrerPoolItem -> STM ()
 pushTransferrerPool p i = do
-	(c, l) <- readTVar p
+	l <- readTVar p
 	let l' = i:l
-	writeTVar p (c, l')
+	writeTVar p l'
 
 {- Note that making a CheckTransferrer may allocate resources,
  - such as a NotificationHandle, so it's important that the returned
  - TransferrerPoolItem is pushed into the pool, and not left to be
  - garbage collected. -}
-mkTransferrerPoolItem :: TransferrerPool -> Transferrer -> IO TransferrerPoolItem
-mkTransferrerPoolItem p t = do
-	mkcheck <- atomically $ fst <$> readTVar p
+mkTransferrerPoolItem :: MkCheckTransferrer -> Transferrer -> IO TransferrerPoolItem
+mkTransferrerPoolItem mkcheck t = do
 	check <- mkcheck
 	return $ TransferrerPoolItem (Just t) check