Remove unused dporAction field

This commit is contained in:
Michael Walker 2017-08-13 20:29:06 +01:00
parent 04bc5158fa
commit d3f6ff1b27

View File

@ -57,9 +57,6 @@ data DPOR = DPOR
-- ^ Transitions which have been taken, excluding -- ^ Transitions which have been taken, excluding
-- conservatively-added ones. This is used in implementing sleep -- conservatively-added ones. This is used in implementing sleep
-- sets. -- sets.
, dporAction :: Maybe ThreadAction
-- ^ What happened at this step. This will be 'Nothing' at the root,
-- 'Just' everywhere else.
} deriving (Eq, Show) } deriving (Eq, Show)
instance NFData DPOR where instance NFData DPOR where
@ -69,7 +66,6 @@ instance NFData DPOR where
, dporDone dpor , dporDone dpor
, dporSleep dpor , dporSleep dpor
, dporTaken dpor , dporTaken dpor
, dporAction dpor
) )
-- | One step of the execution, including information for backtracking -- | One step of the execution, including information for backtracking
@ -110,7 +106,6 @@ initialState = DPOR
, dporDone = S.empty , dporDone = S.empty
, dporSleep = M.empty , dporSleep = M.empty
, dporTaken = M.empty , dporTaken = M.empty
, dporAction = Nothing
} }
-- | Produce a new schedule prefix from a @DPOR@ tree. If there are no new -- | Produce a new schedule prefix from a @DPOR@ tree. If there are no new
@ -196,7 +191,6 @@ incorporateTrace memtype conservative trace dpor0 = grow initialDepState (initia
, dporTaken = case rest of , dporTaken = case rest of
((d', _, a'):_) -> M.singleton (tidOf tid d') a' ((d', _, a'):_) -> M.singleton (tidOf tid d') a'
[] -> M.empty [] -> M.empty
, dporAction = Just a
} }
subtree _ _ _ [] = err "incorporateTrace" "subtree suffix empty!" subtree _ _ _ [] = err "incorporateTrace" "subtree suffix empty!"