From: Navarrop <Pierre.Navarro@imag.fr>
Date: Wed, 14 Sep 2011 11:29:39 +0000 (+0200)
Subject: Make sure that we start at the right NS3 time even when NS3 and SG desynchronize.
X-Git-Tag: v3_6_2~92^2~3
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cd0b0e6661d6ca84295e74f81ba361f328c45dd5?ds=sidebyside

Make sure that we start at the right NS3 time even when NS3 and SG desynchronize.
---

diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc
index 7c62e05cc8..188bea1310 100644
--- a/src/surf/ns3/ns3_simulator.cc
+++ b/src/surf/ns3/ns3_simulator.cc
@@ -71,7 +71,10 @@ void NS3Sim::create_flow_NS3(
 	mysocket->action = action;
 	xbt_dict_set(dict_socket,(const char*)&sock, mysocket,NULL);
 	sock->Bind(InetSocketAddress(port_number));
-	Simulator::Schedule (Seconds(0.0),&StartFlow, sock, addr, port_number);
+	XBT_INFO("Create flow starting to %fs + %fs = %fs",start-ns3_time(), ns3_time(), start);
+	Simulator::Schedule (Seconds(start-ns3_time()),&StartFlow, sock, addr, port_number);
+//	Simulator::Schedule (Seconds(0.0),&StartFlow, sock, addr, port_number);
+
 }
 
 void* NS3Sim::get_action_from_socket(void *socket){