io-sim: EventTxCommitted log created tvars with their labels

Author: coot

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

@@ -406,13 +406,14 @@ schedule thread@Thread{
 
     Atomically a k -> execAtomically time tid tlbl nextVid (runSTM a) $ \res ->
       case res of
-        StmTxCommitted x written _read _created tvarTraces  nextVid' -> do
+        StmTxCommitted x written _read created tvarTraces  nextVid' -> do
           (wakeup, wokeby) <- threadsUnblockedByWrites written
           mapM_ (\(SomeTVar tvar) -> unblockAllThreadsFromTVar tvar) written
           let thread'     = thread { threadControl = ThreadControl (k x) ctl }
               (unblocked,
                simstate') = unblockThreads wakeup simstate
-          vids <- traverse (\(SomeTVar tvar) -> labelledTVarId tvar) written
+          written' <- traverse (\(SomeTVar tvar) -> labelledTVarId tvar) written
+          created' <- traverse (\(SomeTVar tvar) -> labelledTVarId tvar) created
               -- We don't interrupt runnable threads to provide fairness
               -- anywhere else. We do it here by putting the tx that committed
               -- a transaction to the back of the runqueue, behind all other
@@ -422,7 +423,7 @@ schedule thread@Thread{
               -- as it is a fair policy (all runnable threads eventually run).
           trace <- deschedule Yield thread' simstate' { nextVid  = nextVid' }
           return $ SimTrace time tid tlbl (EventTxCommitted
-                                             vids [nextVid..pred nextVid'] Nothing)
+                                             written' created' Nothing)
                  $ traceMany
                      [ (time, tid', tlbl', EventTxWakeup vids')
                      | tid' <- unblocked

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

@@ -760,7 +760,7 @@ data SimEventType
   | EventThreadUnhandled SomeException   -- terminated due to unhandled exception
 
   | EventTxCommitted   [Labelled TVarId] -- tx wrote to these
-                       [TVarId]          -- and created these
+                       [Labelled TVarId] -- and created these
                        (Maybe Effect)    -- effect performed (only for `IOSimPOR`)
   | EventTxAborted     (Maybe Effect)    -- effect performed (only for `IOSimPOR`)
   | EventTxBlocked     [Labelled TVarId] -- tx blocked reading these

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

@@ -547,11 +547,12 @@ schedule thread@Thread{
                simstate') = unblockThreads vClock' wakeup simstate
           sequence_ [ modifySTRef (tvarVClock r) (leastUpperBoundVClock vClock')
                     | SomeTVar r <- created ++ written ]
-          vids <- traverse (\(SomeTVar tvar) -> labelledTVarId tvar) written
+          written' <- traverse (\(SomeTVar tvar) -> labelledTVarId tvar) written
+          created' <- traverse (\(SomeTVar tvar) -> labelledTVarId tvar) created
           -- We deschedule a thread after a transaction... another may have woken up.
           trace <- deschedule Yield thread' simstate' { nextVid  = nextVid' }
           return $
-            SimPORTrace time tid tstep tlbl (EventTxCommitted vids [nextVid..pred nextVid'] (Just effect')) $
+            SimPORTrace time tid tstep tlbl (EventTxCommitted written' created' (Just effect')) $
             traceMany
               -- TODO: step
               [ (time, tid', (-1), tlbl', EventTxWakeup vids')