projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add tests from testsuite/tests/h98
[ghc-base.git]
/
GHC
/
Conc.lhs
diff --git
a/GHC/Conc.lhs
b/GHC/Conc.lhs
index
b12785f
..
de96b2c
100644
(file)
--- a/
GHC/Conc.lhs
+++ b/
GHC/Conc.lhs
@@
-1,7
+1,8
@@
\begin{code}
\begin{code}
-{-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# LANGUAGE CPP, NoImplicitPrelude #-}
{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
{-# OPTIONS_HADDOCK not-home #-}
{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
{-# OPTIONS_HADDOCK not-home #-}
+
-----------------------------------------------------------------------------
-- |
-- Module : GHC.Conc
-----------------------------------------------------------------------------
-- |
-- Module : GHC.Conc
@@
-30,9
+31,13
@@
module GHC.Conc
-- * Forking and suchlike
, forkIO -- :: IO a -> IO ThreadId
, forkIOUnmasked
-- * Forking and suchlike
, forkIO -- :: IO a -> IO ThreadId
, forkIOUnmasked
+ , forkIOWithUnmask
+ , forkOn
, forkOnIO -- :: Int -> IO a -> IO ThreadId
, forkOnIOUnmasked
, forkOnIO -- :: Int -> IO a -> IO ThreadId
, forkOnIOUnmasked
+ , forkOnWithUnmask
, numCapabilities -- :: Int
, numCapabilities -- :: Int
+ , getNumCapabilities -- :: IO Int
, numSparks -- :: IO Int
, childHandler -- :: Exception -> IO ()
, myThreadId -- :: IO ThreadId
, numSparks -- :: IO Int
, childHandler -- :: Exception -> IO ()
, myThreadId -- :: IO ThreadId
@@
-46,6
+51,7
@@
module GHC.Conc
, ThreadStatus(..), BlockReason(..)
, threadStatus -- :: ThreadId -> IO ThreadStatus
, ThreadStatus(..), BlockReason(..)
, threadStatus -- :: ThreadId -> IO ThreadStatus
+ , threadCapability
-- * Waiting
, threadDelay -- :: Int -> IO ()
-- * Waiting
, threadDelay -- :: Int -> IO ()