ns3: no need for 2 postparse callbacks

[simgrid.git] / src / surf / network_ns3.cpp

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index f3ee8d4..3870e53 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -44,9 +44,6 @@ static int number_of_links = 1;
 static int number_of_networks = 1;
 static int port_number = 1025; //Port number is limited from 1025 to 65 000
 
-static NS3Sim* ns3_sim = 0;
-
-
 /*************
  * Callbacks *
  *************/
@@ -204,6 +201,9 @@ static void create_ns3_topology(void)
       xbt_free(link_lat);
     }
   }
+
+  ns3::GlobalRouteManager::BuildGlobalRoutingDatabase();
+  ns3::GlobalRouteManager::InitializeRoutes();
 }
 
 /*********
@@ -230,14 +230,12 @@ 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);
 }
 
 NetworkNS3Model::~NetworkNS3Model() {
-  delete ns3_sim;
   xbt_dynar_free_container(&IPV4addr);
   xbt_dict_free(&flowFromSock);
 }
@@ -255,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);
@@ -408,25 +405,37 @@ int NetworkNS3Action::unref()
 }
 
 
+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 ();
+}
 
+void ns3_create_flow(const char* a,const char *b,double startTime,u_int32_t TotalBytes,simgrid::surf::NetworkNS3Action * action)
+{
+  int node1 = ns3_find_host(a)->node_num;
+  int node2 = ns3_find_host(b)->node_num;
 
+  ns3::Ptr<ns3::Node> src_node = nodes.Get(node1);
+  ns3::Ptr<ns3::Node> dst_node = nodes.Get(node2);
 
-void ns3_simulator(double min){
-  ns3_sim->simulator_start(min);
-}
+  char* addr = (char*)xbt_dynar_get_as(IPV4addr,node2,char*);
 
-void ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,simgrid::surf::NetworkNS3Action * action)
-{
-  ns3_node_t node1 = ns3_find_host(a);
-  ns3_node_t node2 = ns3_find_host(b);
+  XBT_DEBUG("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1, node2,addr);
+  ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress (ns3::Ipv4Address::GetAny(), port_number));
+  sink.Install (dst_node);
 
-  ns3::Ptr<ns3::Node> src_node = nodes.Get(node1->node_num);
-  ns3::Ptr<ns3::Node> dst_node = nodes.Get(node2->node_num);
+  ns3::Ptr<ns3::Socket> sock = ns3::Socket::CreateSocket (src_node, ns3::TcpSocketFactory::GetTypeId());
 
-  char* addr = (char*)xbt_dynar_get_as(IPV4addr,node2->node_num,char*);
+  xbt_dict_set(flowFromSock, transformSocketPtr(sock), new SgFlow(TotalBytes, action), NULL);
 
-  XBT_DEBUG("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1->node_num, node2->node_num,addr);
-  ns3_sim->create_flow_NS3(src_node, dst_node, port_number, start, addr, TotalBytes, action);
+  sock->Bind(ns3::InetSocketAddress(port_number));
+  XBT_DEBUG("Create flow starting to %fs + %fs = %fs",
+      startTime-ns3::Simulator::Now().GetSeconds(), ns3::Simulator::Now().GetSeconds(), startTime);
+
+  ns3::Simulator::Schedule (ns3::Seconds(startTime-ns3::Simulator::Now().GetSeconds()),
+      &StartFlow, sock, addr, port_number);
 
   port_number++;
   xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated.");
@@ -434,9 +443,6 @@ void ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalByt
 
 // initialize the NS3 interface and environment
 void ns3_initialize(const char* TcpProtocol){
-  xbt_assert(!ns3_sim, "ns3 already initialized");
-  ns3_sim = new NS3Sim();
-
 //  tcpModel are:
 //  "ns3::TcpNewReno"
 //  "ns3::TcpReno"
@@ -498,8 +504,7 @@ void ns3_add_cluster(char * bw,char * lat,const char *id)
   XBT_DEBUG("Add router %d to cluster",nodes.GetN()-Nodes.GetN()-1);
   Nodes.Add(nodes.Get(nodes.GetN()-Nodes.GetN()-1));
 
-  if(Nodes.GetN() > 65000)
-    xbt_die("Cluster with NS3 is limited to 65000 nodes");
+  xbt_assert(Nodes.GetN() <= 65000, "Cluster with NS3 is limited to 65000 nodes");
   ns3::CsmaHelper csma;
   csma.SetChannelAttribute ("DataRate", ns3::StringValue (bw));
   csma.SetChannelAttribute ("Delay", ns3::StringValue (lat));
@@ -514,8 +519,7 @@ void ns3_add_cluster(char * bw,char * lat,const char *id)
   interfaces.Add(ipv4.Assign (devices));
 
   if(number_of_links == 255){
-    if(number_of_networks == 255)
-      xbt_die("Number of links and networks exceed 255*255");
+    xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255");
     number_of_links = 1;
     number_of_networks++;
   }else{
@@ -538,7 +542,7 @@ void ns3_add_link(int src, int dst, char *bw, char *lat)
     LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO);
   }
 
-  ns3::MyPointToPointHelper pointToPoint;
+  ns3::PointToPointHelper pointToPoint;
 
   ns3::NetDeviceContainer netA;
   ns3::Ipv4AddressHelper address;
@@ -549,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));
 
@@ -567,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();
-}