barrucadu/dejafu
1
1
Fork 0
mirror of https://github.com/barrucadu/dejafu.git synced 2024-11-27 04:36:57 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #290 from pepeiborra/master

Browse Source 
Compatibility with GHC 8.6.2
This commit is contained in:
Michael Walker 2018-12-01 12:52:19 +00:00 committed by GitHub
commit 413adfbb22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
dejafu-tests/lib/Examples/ParMonad/Direct.hs
View File

@ -268,31 +268,34 @@ runParIO userComp = do
------------------------------------------------------------
Nothing -> do
allscheds <- makeScheds main_cpu
[Session _ topSessFlag] <- readHotVar$ sessions$ head allscheds
sessions <- readHotVar$ sessions$ head allscheds
case sessions of
[Session _ topSessFlag] -> do
mfin <- newEmptyMVar
forM_ (zip [0..] allscheds) $ \(cpu,sched) -> do
workerDone <- newEmptyMVar
----------------------------------------
let wname = "(worker "++show cpu++" of originator "++show tidorig++")"
-- forkOn cpu $ do
_ <- forkWithExceptions (forkOn cpu) wname $ do
------------------------------------------------------------STRT WORKER THREAD
tid2 <- myThreadId
registerWorker tid2 sched
if cpu /= main_cpu
then do runReaderWith sched $ rescheduleR 0 (trivialCont (wname++show tid2))
putMVar workerDone cpu
else do x <- runNewSessionAndWait "top-lvl main worker" sched userComp
-- When the main worker finishes we can tell the anonymous "system" workers:
writeIORef topSessFlag True
putMVar mfin x
mfin <- newEmptyMVar
forM_ (zip [0..] allscheds) $ \(cpu,sched) -> do
workerDone <- newEmptyMVar
----------------------------------------
let wname = "(worker "++show cpu++" of originator "++show tidorig++")"
-- forkOn cpu $ do
_ <- forkWithExceptions (forkOn cpu) wname $ do
------------------------------------------------------------STRT WORKER THREAD
tid2 <- myThreadId
registerWorker tid2 sched
if cpu /= main_cpu
then do runReaderWith sched $ rescheduleR 0 (trivialCont (wname++show tid2))
putMVar workerDone cpu
else do x <- runNewSessionAndWait "top-lvl main worker" sched userComp
-- When the main worker finishes we can tell the anonymous "system" workers:
writeIORef topSessFlag True
putMVar mfin x
unregisterWorker tid
------------------------------------------------------------END WORKER THREAD
pure (if cpu == main_cpu then Nothing else Just workerDone)
unregisterWorker tid
------------------------------------------------------------END WORKER THREAD
pure (if cpu == main_cpu then Nothing else Just workerDone)
takeMVar mfin -- Final value.
takeMVar mfin -- Final value.
_ -> error "sessions"
----------------------------------------
@ -445,14 +448,17 @@ rescheduleR cnt kont = do
mtask <- lift $ popWork mysched
case mtask of
Nothing -> do
Session _ finRef:_ <- lift $ readIORef $ sessions mysched
fin <- lift $ readIORef finRef
if fin
then kont (error "Direct.hs: The result value from rescheduleR should not be used.")
else do
lift $ steal mysched
lift yield
rescheduleR (cnt+1) kont
sessions <- lift $ readIORef $ sessions mysched
case sessions of
Session _ finRef:_ -> do
fin <- lift $ readIORef finRef
if fin
then kont (error "Direct.hs: The result value from rescheduleR should not be used.")
else do
lift $ steal mysched
lift yield
rescheduleR (cnt+1) kont
_ -> error "sessions"
Just task -> do
let C.ContT fn = unPar task
-- Run the stolen task with a continuation that returns to the scheduler if the task exits normally:

4
dejafu/dejafu.cabal
View File

@ -59,11 +59,11 @@ library
-- other-extensions:
build-depends: base >=4.9 && <5
, concurrency >=1.6 && <1.7
, containers >=0.5 && <0.6
, containers >=0.5 && <0.7
, contravariant >=1.2 && <1.6
, deepseq >=1.1 && <2
, exceptions >=0.7 && <0.11
, leancheck >=0.6 && <0.8
, leancheck >=0.6 && <0.9
, profunctors >=4.0 && <6
, random >=1.0 && <1.2
, transformers >=0.5 && <0.6