Commit 6ec9f4a1 authored by Georgios Dagkakis's avatar Georgios Dagkakis

Machine does not need to reset flags that are reset elsewhere

parent 0b61b824
......@@ -627,9 +627,6 @@ class Machine(CoreObject):
self.expectedSignals['interruptionEnd']=1
yield self.interruptionEnd # interruptionEnd to be triggered by ObjectInterruption
self.expectedSignals['interruptionEnd']=0
transmitter, eventTime=self.interruptionEnd.value
assert eventTime==self.env.now, 'the interruptionEnd was received later than anticipated'
self.interruptionEnd=self.env.event()
......@@ -708,10 +705,6 @@ class Machine(CoreObject):
else:
processingNotFinished=False
self.expectedSignals['interruptionStart']=0
self.expectedSignals['preemptQueue']=0
# carry on actions that have to take place when an Entity ends its processing
self.endProcessingActions()
# =============== release resource after the end of processing
......@@ -758,8 +751,6 @@ class Machine(CoreObject):
yield self.interruptionEnd # interruptionEnd to be triggered by ObjectInterruption
self.expectedSignals['interruptionEnd']=0
transmitter, eventTime=self.interruptionEnd.value
assert eventTime==self.env.now, 'the victim of the failure is not the object that received it'
self.interruptionEnd=self.env.event()
......@@ -794,7 +785,6 @@ class Machine(CoreObject):
yield self.entityRemoved
self.expectedSignals['entityRemoved']=0
transmitter, eventTime=self.entityRemoved.value
self.printTrace(self.id, entityRemoved=eventTime)
......@@ -805,8 +795,6 @@ class Machine(CoreObject):
if not self.haveToDispose():
break
self.expectedSignals['canDispose']=0
# =======================================================================
# actions to be carried out when the processing of an Entity ends
# =======================================================================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment