summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Crayne <joe@jerkface.net>2018-06-28 16:14:26 -0400
committerJoe Crayne <joe@jerkface.net>2018-06-28 19:23:14 -0400
commit8ff122d2d381fc9b1dd5c16067fba19f89512261 (patch)
tree4ce94c3cf3a0ffb7cb99c43d7dadd59094f31105
parent4ab1de695cb484f7859cb5d1794da5ce6510c0c2 (diff)
Kademlia.Search: fork -> forkIO
-rw-r--r--src/Control/Concurrent/Lifted/Instrument.hs2
-rw-r--r--src/Control/Concurrent/Tasks.hs2
-rw-r--r--src/Network/Kademlia/Search.hs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Control/Concurrent/Lifted/Instrument.hs b/src/Control/Concurrent/Lifted/Instrument.hs
index 4aa9268f..91d4c0a4 100644
--- a/src/Control/Concurrent/Lifted/Instrument.hs
+++ b/src/Control/Concurrent/Lifted/Instrument.hs
@@ -43,7 +43,7 @@ globals = unsafePerformIO $ newMVar $ GlobalState
43 43
44 44
45forkIO :: IO () -> IO ThreadId 45forkIO :: IO () -> IO ThreadId
46forkIO = fork 46forkIO = GHC.forkIO
47{-# INLINE forkIO #-} 47{-# INLINE forkIO #-}
48 48
49forkOS :: MonadBaseControl IO m => m () -> m ThreadId 49forkOS :: MonadBaseControl IO m => m () -> m ThreadId
diff --git a/src/Control/Concurrent/Tasks.hs b/src/Control/Concurrent/Tasks.hs
index 287542ee..da2e589e 100644
--- a/src/Control/Concurrent/Tasks.hs
+++ b/src/Control/Concurrent/Tasks.hs
@@ -20,7 +20,7 @@ withTaskGroup :: String -> Int -> (TaskGroup -> IO ()) -> IO ()
20withTaskGroup glabel numslots action = do 20withTaskGroup glabel numslots action = do
21 tg <- atomically $ newTChan 21 tg <- atomically $ newTChan
22 cnt <- atomically $ newTVar 0 22 cnt <- atomically $ newTVar 0
23 thread <- fork $ do 23 thread <- forkIO $ do
24 myThreadId >>= flip labelThread glabel 24 myThreadId >>= flip labelThread glabel
25 fix $ \again -> do 25 fix $ \again -> do
26 (slot, (lbl,task)) <- atomically $ do 26 (slot, (lbl,task)) <- atomically $ do
diff --git a/src/Network/Kademlia/Search.hs b/src/Network/Kademlia/Search.hs
index e13e0742..d3aaae28 100644
--- a/src/Network/Kademlia/Search.hs
+++ b/src/Network/Kademlia/Search.hs
@@ -199,7 +199,7 @@ search ::
199search sch buckets target result = do 199search sch buckets target result = do
200 let ns = R.kclosest (searchSpace sch) searchK target buckets 200 let ns = R.kclosest (searchSpace sch) searchK target buckets
201 st <- atomically $ newSearch sch target ns 201 st <- atomically $ newSearch sch target ns
202 fork $ searchLoop sch target result st 202 forkIO $ searchLoop sch target result st
203 return st 203 return st
204 204
205searchLoop :: ( Ord addr, Ord nid, Ord ni, Show nid, Hashable nid, Hashable ni ) 205searchLoop :: ( Ord addr, Ord nid, Ord ni, Show nid, Hashable nid, Hashable ni )