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
93738c1f
Commit
93738c1f
authored
Jun 26, 2015
by
Ioannis Papagiannopoulos
Committed by
Georgios Dagkakis
Jun 29, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
initialWIP and initial Off shift problem fixed
parent
01c72188
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
dream/simulation/Machine.py
dream/simulation/Machine.py
+6
-1
No files found.
dream/simulation/Machine.py
View file @
93738c1f
...
@@ -643,6 +643,10 @@ class Machine(CoreObject):
...
@@ -643,6 +643,10 @@ class Machine(CoreObject):
assert
eventTime
==
self
.
env
.
now
,
'initialWIP was not received on time'
assert
eventTime
==
self
.
env
.
now
,
'initialWIP was not received on time'
self
.
initialWIP
=
self
.
env
.
event
()
self
.
initialWIP
=
self
.
env
.
event
()
self
.
isProcessingInitialWIP
=
True
self
.
isProcessingInitialWIP
=
True
if
not
self
.
checkIfActive
():
continue
break
if
self
.
isProcessingInitialWIP
:
break
break
# TODO: maybe here have to assigneExit of the giver and add self to operator activeCallers list
# TODO: maybe here have to assigneExit of the giver and add self to operator activeCallers list
...
@@ -658,7 +662,7 @@ class Machine(CoreObject):
...
@@ -658,7 +662,7 @@ class Machine(CoreObject):
#===================================================================
#===================================================================
# # request a resource if there is a need for load operation
# # request a resource if there is a need for load operation
#===================================================================
#===================================================================
if
self
.
shouldYield
(
operationTypes
=
{
"Load"
:
1
}):
if
self
.
shouldYield
(
operationTypes
=
{
"Load"
:
1
})
and
not
self
.
isProcessingInitialWIP
:
self
.
timeWaitForLoadOperatorStarted
=
self
.
env
.
now
self
.
timeWaitForLoadOperatorStarted
=
self
.
env
.
now
yield
self
.
env
.
process
(
self
.
request
())
yield
self
.
env
.
process
(
self
.
request
())
self
.
timeWaitForLoadOperatorEnded
=
self
.
env
.
now
self
.
timeWaitForLoadOperatorEnded
=
self
.
env
.
now
...
@@ -1230,6 +1234,7 @@ class Machine(CoreObject):
...
@@ -1230,6 +1234,7 @@ class Machine(CoreObject):
if
G
.
RouterList
[
0
].
expectedFinishSignals
:
if
G
.
RouterList
[
0
].
expectedFinishSignals
:
if
self
.
id
in
G
.
RouterList
[
0
].
expectedFinishSignalsDict
:
if
self
.
id
in
G
.
RouterList
[
0
].
expectedFinishSignalsDict
:
signal
=
G
.
RouterList
[
0
].
expectedFinishSignalsDict
[
self
.
id
]
signal
=
G
.
RouterList
[
0
].
expectedFinishSignalsDict
[
self
.
id
]
print
"(((())))"
*
4
,
self
.
env
.
now
,
'signaling router on release operator'
self
.
sendSignal
(
receiver
=
G
.
RouterList
[
0
],
signal
=
signal
)
self
.
sendSignal
(
receiver
=
G
.
RouterList
[
0
],
signal
=
signal
)
self
.
broker
.
invokeType
=
'release'
self
.
broker
.
invokeType
=
'release'
self
.
broker
.
invoke
()
self
.
broker
.
invoke
()
...
...
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