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
250e7090
Commit
250e7090
authored
Sep 09, 2014
by
Ioannis Papagiannopoulos
Committed by
Georgios Dagkakis
Nov 03, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update due to merge issues
parent
5e5158f9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
dream/simulation/ManPyObject.py
dream/simulation/ManPyObject.py
+6
-4
No files found.
dream/simulation/ManPyObject.py
View file @
250e7090
...
@@ -55,9 +55,10 @@ class ManPyObject(object):
...
@@ -55,9 +55,10 @@ class ManPyObject(object):
from
Globals
import
G
from
Globals
import
G
G
.
Router
.
allocation
=
True
G
.
Router
.
allocation
=
True
G
.
Router
.
waitEndProcess
=
False
G
.
Router
.
waitEndProcess
=
False
if
not
G
.
Router
.
invoked
:
if
not
G
.
Router
.
invoked
and
G
.
Router
.
expectedSignals
[
'isCalled'
]
:
G
.
Router
.
invoked
=
True
G
.
Router
.
invoked
=
True
G
.
Router
.
isCalled
.
succeed
(
G
.
env
.
now
)
succeedTuple
=
(
G
.
env
,
G
.
env
.
now
)
G
.
Router
.
isCalled
.
succeed
(
succeedTuple
)
#===========================================================================
#===========================================================================
# signalRouter method
# signalRouter method
...
@@ -72,10 +73,11 @@ class ManPyObject(object):
...
@@ -72,10 +73,11 @@ class ManPyObject(object):
if
receiver
.
isLoadRequested
():
if
receiver
.
isLoadRequested
():
try
:
try
:
from
Globals
import
G
from
Globals
import
G
if
not
G
.
Router
.
invoked
:
if
not
G
.
Router
.
invoked
and
G
.
Router
.
expectedSignals
[
'isCalled'
]
:
# self.printTrace(self.id, signal='router')
# self.printTrace(self.id, signal='router')
G
.
Router
.
invoked
=
True
G
.
Router
.
invoked
=
True
G
.
Router
.
isCalled
.
succeed
(
G
.
env
.
now
)
succeedTuple
=
(
G
.
env
,
G
.
env
.
now
)
G
.
Router
.
isCalled
.
succeed
(
succeedTuple
)
return
True
return
True
except
:
except
:
return
False
return
False
...
...
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