From 4ddc9a65d2ca15a45ffbb3840a6a927b13936fbf Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Mon, 2 Jun 2014 19:20:18 +0200 Subject: [PATCH] ns-3 simulator synchronizing start --- src/nepi/resources/linux/ns3/ns3simulation.py | 4 ++-- src/nepi/resources/ns3/ns3wrapper.py | 12 +----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/nepi/resources/linux/ns3/ns3simulation.py b/src/nepi/resources/linux/ns3/ns3simulation.py index 94029a14..596ff02e 100644 --- a/src/nepi/resources/linux/ns3/ns3simulation.py +++ b/src/nepi/resources/linux/ns3/ns3simulation.py @@ -277,9 +277,9 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation): self._client.start() - # Wait until the Simulation starts... + # Wait until the Simulation is actually started... is_running = False - for i in xrange(100): + for i in xrange(1000): is_running = self.invoke(SIMULATOR_UUID, "isRunning") if is_running: diff --git a/src/nepi/resources/ns3/ns3wrapper.py b/src/nepi/resources/ns3/ns3wrapper.py index f6075b07..a7dff070 100644 --- a/src/nepi/resources/ns3/ns3wrapper.py +++ b/src/nepi/resources/ns3/ns3wrapper.py @@ -213,7 +213,7 @@ class NS3Wrapper(object): def invoke(self, uuid, operation, *args, **kwargs): if operation == "isRunning": - return self._is_running() + return self.is_running() if operation == "isAppRunning": return self._is_app_running(uuid) if operation == "addStaticRoute": @@ -449,16 +449,6 @@ class NS3Wrapper(object): return realkwargs - def _is_running(self): - if self.ns3.Simulator.IsFinished(): - return False - - now = self.ns3.Simulator.Now() - if now.IsZero(): - return False - - return True - def _is_app_running(self, uuid): now = self.ns3.Simulator.Now() if now.IsZero(): -- 2.47.0