move forkWithAffinity

awkward-squad · Nov 28, 2023 · 59312dc · 59312dc
1 parent bb0115d
commit 59312dc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/ki/src/Ki/Internal/Scope.hs b/ki/src/Ki/Internal/Scope.hs
@@ -61,7 +61,8 @@ import Ki.Internal.IO
   )
 import Ki.Internal.NonblockingSTM
 import Ki.Internal.Propagating (Tid, peelOffPropagating, propagate, pattern PropagatingFrom)
-import Ki.Internal.Thread (Thread, forkWithAffinity, makeThread)
+import Ki.Internal.Thread (Thread, makeThread)
+import Ki.Internal.ThreadAffinity (forkWithAffinity)
 import Ki.Internal.ThreadOptions (ThreadOptions (..), defaultThreadOptions)
 
 -- | A scope.

diff --git a/ki/src/Ki/Internal/Thread.hs b/ki/src/Ki/Internal/Thread.hs
@@ -2,15 +2,13 @@ module Ki.Internal.Thread
   ( Thread,
     makeThread,
     await,
-    forkWithAffinity,
   )
 where
 
-import Control.Concurrent (ThreadId, forkOS)
+import Control.Concurrent (ThreadId)
 import Control.Exception (BlockedIndefinitelyOnSTM (..))
 import GHC.Conc (STM)
-import Ki.Internal.IO (forkIO, forkOn, tryEitherSTM)
-import Ki.Internal.ThreadAffinity (ThreadAffinity (..))
+import Ki.Internal.IO (tryEitherSTM)
 
 -- | A thread.
 --
@@ -48,13 +46,6 @@ makeThread threadId action =
       await_ = tryEitherSTM (\BlockedIndefinitelyOnSTM -> action) pure action
     }
 
--- forkIO/forkOn/forkOS, switching on affinity
-forkWithAffinity :: ThreadAffinity -> IO () -> IO ThreadId
-forkWithAffinity = \case
-  Unbound -> forkIO
-  Capability n -> forkOn n
-  OsThread -> Control.Concurrent.forkOS
-
 -- | Wait for a thread to terminate.
 await :: Thread a -> STM a
 await =

diff --git a/ki/src/Ki/Internal/ThreadAffinity.hs b/ki/src/Ki/Internal/ThreadAffinity.hs
@@ -1,8 +1,12 @@
 module Ki.Internal.ThreadAffinity
   ( ThreadAffinity (..),
+    forkWithAffinity,
   )
 where
 
+import Control.Concurrent (ThreadId, forkOS)
+import Ki.Internal.IO (forkIO, forkOn)
+
 -- | What, if anything, a thread is bound to.
 data ThreadAffinity
   = -- | Unbound.
@@ -12,3 +16,10 @@ data ThreadAffinity
   | -- | Bound to an OS thread.
     OsThread
   deriving stock (Eq, Show)
+
+-- forkIO/forkOn/forkOS, switching on affinity
+forkWithAffinity :: ThreadAffinity -> IO () -> IO ThreadId
+forkWithAffinity = \case
+  Unbound -> forkIO
+  Capability n -> forkOn n
+  OsThread -> forkOS