From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 26 Mar 2016 09:42:28 +0000 (+0100)
Subject: ns3: no need for 2 postparse callbacks
X-Git-Tag: v3_13~284
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e597737e01b6ac76d6e9ccdf67a85c03c53de7c3?hp=2652a7d2c9ebb969683d8fd94b11c96489327912

ns3: no need for 2 postparse callbacks
---

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index d8f4ba7be7..3870e535b4 100644
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -201,6 +201,9 @@ static void create_ns3_topology(void)
       xbt_free(link_lat);
     }
   }
+
+  ns3::GlobalRouteManager::BuildGlobalRoutingDatabase();
+  ns3::GlobalRouteManager::InitializeRoutes();
 }
 
 /*********
@@ -227,7 +230,6 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
   simgrid::surf::on_link.connect(netlink_parse_init);
   simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
   simgrid::surf::on_postparse.connect(&create_ns3_topology); //get_one_link_routes
-  simgrid::surf::on_postparse.connect(&ns3_end_platform); //InitializeRoutes
 
   NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(xbt_free_f);
   NS3_ASR_LEVEL  = xbt_lib_add_level(as_router_lib, xbt_free_f);
@@ -251,7 +253,6 @@ Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, double size, do
 
   ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, action);
 
-  action->m_lastSent = 0;
   action->p_srcElm = src;
   action->p_dstElm = dst;
   networkCommunicateCallbacks(action, src, dst, size, rate);
@@ -404,10 +405,10 @@ int NetworkNS3Action::unref()
 }
 
 
-void ns3_simulator(double min){
-  if (min > 0.0) // If there is a maximum amount of time to run
-    ns3::Simulator::Stop(ns3::Seconds(min));
-  XBT_DEBUG("Start simulator for at most %fs",min);
+void ns3_simulator(double maxSeconds){
+  if (maxSeconds > 0.0) // If there is a maximum amount of time to run
+    ns3::Simulator::Stop(ns3::Seconds(maxSeconds));
+  XBT_DEBUG("Start simulator for at most %fs",maxSeconds);
   ns3::Simulator::Run ();
 }
 
@@ -552,7 +553,6 @@ void ns3_add_link(int src, int dst, char *bw, char *lat)
   XBT_DEBUG("\tAdd PTP from %d to %d bw:'%s' lat:'%s'",src,dst,bw,lat);
   pointToPoint.SetDeviceAttribute ("DataRate", ns3::StringValue (bw));
   pointToPoint.SetChannelAttribute ("Delay", ns3::StringValue (lat));
-  //pointToPoint.EnablePcapAll("test_ns3_trace"); //DEBUG
 
   netA.Add(pointToPoint.Install (a, b));
 
@@ -570,19 +570,11 @@ void ns3_add_link(int src, int dst, char *bw, char *lat)
   xbt_dynar_set_as(IPV4addr,dst,char*,tmp);
   XBT_DEBUG("Have write '%s' for Node '%d'",(char*)xbt_dynar_get_as(IPV4addr,dst,char*),dst);
 
-  if(number_of_links == 255){
-    if(number_of_networks == 255)
-      xbt_die("Number of links and networks exceed 255*255");
+  if (number_of_links == 255){
+    xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255");
     number_of_links = 1;
     number_of_networks++;
-  }else{
+  } else {
     number_of_links++;
   }
 }
-
-void ns3_end_platform(void)
-{
-  XBT_DEBUG("InitializeRoutes");
-  ns3::GlobalRouteManager::BuildGlobalRoutingDatabase();
-  ns3::GlobalRouteManager::InitializeRoutes();
-}
diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 7b36d1b94b..6059c2df83 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -55,7 +55,7 @@ void suspend();
 void resume();
 
 //private:
-  double m_lastSent;
+  double m_lastSent = 0;
   NetCard *p_srcElm;
   NetCard *p_dstElm;
 };
diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.h
index 07ccc66f1e..d887e44ab3 100644
--- a/src/surf/ns3/ns3_interface.h
+++ b/src/surf/ns3/ns3_interface.h
@@ -32,12 +32,11 @@ SG_BEGIN_DECL()
 
 XBT_PUBLIC(void)   ns3_initialize(const char* TcpProtocol);
 XBT_PUBLIC(void)   ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,simgrid::surf::NetworkNS3Action * action);
-XBT_PUBLIC(void)   ns3_simulator(double min);
+XBT_PUBLIC(void)   ns3_simulator(double maxSeconds);
 XBT_PUBLIC(void *) ns3_add_host_cluster(const char * id);
 XBT_PUBLIC(void *) ns3_add_router(const char * id);
 XBT_PUBLIC(void)   ns3_add_link(int src, int dst, char * bw,char * lat);
 XBT_PUBLIC(void)   ns3_add_cluster(char * bw,char * lat,const char *id);
-XBT_PUBLIC(void)   ns3_end_platform(void);
 
 inline
 ns3_node_t ns3_find_host(const char* id)