Commit 250e7090 authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Georgios Dagkakis

update due to merge issues

parent 5e5158f9
...@@ -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
......
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