From 797028d4d60ed8e4720f2733a497df484bde25cd Mon Sep 17 00:00:00 2001
From: Lucas Schnorr <Lucas.Schnorr@imag.fr>
Date: Thu, 8 Sep 2011 10:57:42 +0200
Subject: [PATCH] [NS3] single call to start the NS3 simulator

---
 src/surf/ns3/ns3_interface.cc |  3 +--
 src/surf/ns3/ns3_simulator.cc | 15 +++++----------
 src/surf/ns3/ns3_simulator.h  |  3 +--
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc
index 0640c954f0..33ad6943cb 100644
--- a/src/surf/ns3/ns3_interface.cc
+++ b/src/surf/ns3/ns3_interface.cc
@@ -35,8 +35,7 @@ int port_number = 1025; //Port number is limited from 1025 to 65 000
 static NS3Sim* ns3_sim = 0;
 
 void ns3_simulator(double min){
-			ns3_sim->simulator_stop(min);
-			ns3_sim->simulator_start();
+			ns3_sim->simulator_start(min);
 }
 
 void* ns3_get_socket_action(void *socket){
diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc
index 99e93d15a7..6b0ce29994 100644
--- a/src/surf/ns3/ns3_simulator.cc
+++ b/src/surf/ns3/ns3_simulator.cc
@@ -90,16 +90,11 @@ double NS3Sim::get_sent_from_socket(void *socket){
   return ((MySocket *)socket)->sentBytes;
 }
 
-void NS3Sim::simulator_stop(double min){
-	if(min > 0.0)
-		Simulator::Stop(Seconds(min));
-	else
-		Simulator::Stop();
-}
-
-void NS3Sim::simulator_start(void){
-	XBT_DEBUG("Start simulator");
-	Simulator::Run ();
+void NS3Sim::simulator_start(double min){
+  if(min > 0.0)
+    Simulator::Stop(Seconds(min));
+  XBT_DEBUG("Start simulator");
+  Simulator::Run ();
 }
 
 static void receive_callback(Ptr<Socket> localSocket){
diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h
index 1335f0261b..4f91f1aca5 100644
--- a/src/surf/ns3/ns3_simulator.h
+++ b/src/surf/ns3/ns3_simulator.h
@@ -58,8 +58,7 @@ public:
 						const char *addr,
 						uint32_t TotalBytes,
 						void * action);
-	void simulator_stop(double min);
-	void simulator_start(void);
+	void simulator_start(double min);
 	void* get_action_from_socket(void *socket);
 	double get_remains_from_socket(void *socket);
 	double get_sent_from_socket(void *socket);
-- 
2.20.1