Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
dream
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
dream
Commits
6ec9f4a1
Commit
6ec9f4a1
authored
Sep 09, 2014
by
Georgios Dagkakis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Machine does not need to reset flags that are reset elsewhere
parent
0b61b824
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
15 deletions
+3
-15
dream/simulation/Machine.py
dream/simulation/Machine.py
+3
-15
No files found.
dream/simulation/Machine.py
View file @
6ec9f4a1
...
@@ -627,9 +627,6 @@ class Machine(CoreObject):
...
@@ -627,9 +627,6 @@ class Machine(CoreObject):
self
.
expectedSignals
[
'interruptionEnd'
]
=
1
self
.
expectedSignals
[
'interruptionEnd'
]
=
1
yield
self
.
interruptionEnd
# interruptionEnd to be triggered by ObjectInterruption
yield
self
.
interruptionEnd
# interruptionEnd to be triggered by ObjectInterruption
self
.
expectedSignals
[
'interruptionEnd'
]
=
0
transmitter
,
eventTime
=
self
.
interruptionEnd
.
value
transmitter
,
eventTime
=
self
.
interruptionEnd
.
value
assert
eventTime
==
self
.
env
.
now
,
'the interruptionEnd was received later than anticipated'
assert
eventTime
==
self
.
env
.
now
,
'the interruptionEnd was received later than anticipated'
self
.
interruptionEnd
=
self
.
env
.
event
()
self
.
interruptionEnd
=
self
.
env
.
event
()
...
@@ -707,11 +704,7 @@ class Machine(CoreObject):
...
@@ -707,11 +704,7 @@ class Machine(CoreObject):
# if no interruption occurred the processing in M1 is ended
# if no interruption occurred the processing in M1 is ended
else
:
else
:
processingNotFinished
=
False
processingNotFinished
=
False
self
.
expectedSignals
[
'interruptionStart'
]
=
0
self
.
expectedSignals
[
'preemptQueue'
]
=
0
# carry on actions that have to take place when an Entity ends its processing
# carry on actions that have to take place when an Entity ends its processing
self
.
endProcessingActions
()
self
.
endProcessingActions
()
# =============== release resource after the end of processing
# =============== release resource after the end of processing
...
@@ -757,9 +750,7 @@ class Machine(CoreObject):
...
@@ -757,9 +750,7 @@ class Machine(CoreObject):
self
.
expectedSignals
[
'interruptionEnd'
]
=
1
self
.
expectedSignals
[
'interruptionEnd'
]
=
1
yield
self
.
interruptionEnd
# interruptionEnd to be triggered by ObjectInterruption
yield
self
.
interruptionEnd
# interruptionEnd to be triggered by ObjectInterruption
self
.
expectedSignals
[
'interruptionEnd'
]
=
0
transmitter
,
eventTime
=
self
.
interruptionEnd
.
value
transmitter
,
eventTime
=
self
.
interruptionEnd
.
value
assert
eventTime
==
self
.
env
.
now
,
'the victim of the failure is not the object that received it'
assert
eventTime
==
self
.
env
.
now
,
'the victim of the failure is not the object that received it'
self
.
interruptionEnd
=
self
.
env
.
event
()
self
.
interruptionEnd
=
self
.
env
.
event
()
...
@@ -793,8 +784,7 @@ class Machine(CoreObject):
...
@@ -793,8 +784,7 @@ class Machine(CoreObject):
self
.
expectedSignals
[
'entityRemoved'
]
=
1
self
.
expectedSignals
[
'entityRemoved'
]
=
1
yield
self
.
entityRemoved
yield
self
.
entityRemoved
self
.
expectedSignals
[
'entityRemoved'
]
=
0
transmitter
,
eventTime
=
self
.
entityRemoved
.
value
transmitter
,
eventTime
=
self
.
entityRemoved
.
value
self
.
printTrace
(
self
.
id
,
entityRemoved
=
eventTime
)
self
.
printTrace
(
self
.
id
,
entityRemoved
=
eventTime
)
...
@@ -804,8 +794,6 @@ class Machine(CoreObject):
...
@@ -804,8 +794,6 @@ class Machine(CoreObject):
# if while waiting (for a canDispose event) became free as the machines that follows emptied it, then proceed
# if while waiting (for a canDispose event) became free as the machines that follows emptied it, then proceed
if
not
self
.
haveToDispose
():
if
not
self
.
haveToDispose
():
break
break
self
.
expectedSignals
[
'canDispose'
]
=
0
# =======================================================================
# =======================================================================
# actions to be carried out when the processing of an Entity ends
# actions to be carried out when the processing of an Entity ends
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment