io-sim-por: converted effectWakeup to a set

Author: coot

io-sim/src/Control/Monad/IOSimPOR/Internal.hs

@@ -1745,7 +1745,7 @@ updateRaces thread@Thread { threadId = tid }
                              }
           where
             concurrent :: Set ThreadId
-            concurrent = foldr Set.delete concurrent0 (effectWakeup newEffect)
+            concurrent = concurrent0 Set.\\ effectWakeup newEffect
 
             isBlocking :: Bool
             isBlocking = isThreadBlocked thread && onlyReadEffect newEffect
@@ -1758,7 +1758,7 @@ updateRaces thread@Thread { threadId = tid }
                                            stepInfoRaces  } =
           -- if this step depends on the previous step, or is not concurrent,
           -- then any threads that it wakes up become non-concurrent also.
-          let !lessConcurrent = foldr Set.delete concurrent (effectWakeup newEffect) in
+          let !lessConcurrent = concurrent Set.\\ effectWakeup newEffect in
 
           if tid `notElem` concurrent
             then stepInfo { stepInfoConcurrent = lessConcurrent }

io-sim/src/Control/Monad/IOSimPOR/Types.hs

@@ -40,7 +40,7 @@ data Effect = Effect {
     effectWrites :: !(Set TVarId),
     effectForks  :: !(Set ThreadId),
     effectThrows :: ![ThreadId],
-    effectWakeup :: ![ThreadId]
+    effectWakeup :: !(Set ThreadId)
   }
   deriving Eq
 
@@ -57,10 +57,10 @@ instance Show Effect where
 
 instance Semigroup Effect where
   Effect r w s ts wu <> Effect r' w' s' ts' wu' =
-    Effect (r <> r') (w <> w') (s <> s') (ts ++ ts') (wu++wu')
+    Effect (r <> r') (w <> w') (s <> s') (ts ++ ts') (wu <> wu')
 
 instance Monoid Effect where
-  mempty = Effect Set.empty Set.empty Set.empty [] []
+  mempty = Effect Set.empty Set.empty Set.empty [] Set.empty
 
 --
 -- Effect smart constructors
@@ -85,7 +85,7 @@ throwToEffect :: ThreadId -> Effect
 throwToEffect tid = mempty{ effectThrows = [tid] }
 
 wakeupEffects :: [ThreadId] -> Effect
-wakeupEffects tids = mempty{effectWakeup = tids}
+wakeupEffects tids = mempty{effectWakeup = Set.fromList tids}
 
 --
 -- Utils