[NS3] single call to start the NS3 simulator

[simgrid.git] / src / surf / ns3 / ns3_interface.cc

diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc
index 8fcc51e..33ad694 100644 (file)
--- a/src/surf/ns3/ns3_interface.cc
+++ b/src/surf/ns3/ns3_interface.cc
@@ -10,14 +10,6 @@
 #include "xbt/log.h"
 #include "xbt/dynar.h"
 
-#include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
-#include "ns3/node-module.h"
-#include "ns3/helper-module.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/ipv4-global-routing-helper.h"
-
 using namespace ns3;
 
 extern xbt_lib_t host_lib;
@@ -43,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){
@@ -55,11 +46,14 @@ double ns3_get_socket_remains(void *socket){
                return ns3_sim->get_remains_from_socket(socket);
 }
 
+double ns3_get_socket_sent(void *socket){
+  return ns3_sim->get_sent_from_socket(socket);
+}
+
 char ns3_get_socket_is_finished(void *socket){
                return ns3_sim->get_finished(socket);
 }
 
-
 double ns3_time(){
        return Simulator::Now().GetSeconds();
 }
@@ -74,7 +68,7 @@ int ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalByte
 
        char* addr = (char*)xbt_dynar_get_ptr(IPV4addr,node2->node_num);
 
-       XBT_INFO("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1->node_num, node2->node_num,addr);
+       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,
@@ -97,10 +91,38 @@ int ns3_finalize(void){
 }
 
 // initialize the NS3 interface and environment
-int ns3_initialize(void){
+int ns3_initialize(const char* TcpProtocol){
   xbt_assert(!ns3_sim, "ns3 already initialized");
   ns3_sim = new NS3Sim();
-  return 0;
+
+//  tcpModel are:
+//  "ns3::TcpNewReno"
+//  "ns3::TcpReno"
+//  "ns3::TcpTahoe"
+
+  Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1000)); // 1000-byte packet for easier reading
+  Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));
+
+  if(!strcmp(TcpProtocol,"default")){
+         return 0;
+  }
+  if(!strcmp(TcpProtocol,"Reno")){
+         XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+         Config::SetDefault ("ns3::TcpL4Protocol::SocketType", StringValue("ns3::TcpReno"));
+         return 0;
+  }
+  if(!strcmp(TcpProtocol,"NewReno")){
+         XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+         Config::SetDefault ("ns3::TcpL4Protocol::SocketType", StringValue("ns3::TcpNewReno"));
+         return 0;
+  }
+  if(!strcmp(TcpProtocol,"Tahoe")){
+         XBT_INFO("Switching Tcp protocol to '%s'",TcpProtocol);
+         Config::SetDefault ("ns3::TcpL4Protocol::SocketType", StringValue("ns3::TcpTahoe"));
+         return 0;
+  }
+
+  XBT_ERROR("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
 }
 
 void * ns3_add_host(char * id)
@@ -188,7 +210,6 @@ void * ns3_add_cluster(char * bw,char * lat,char *id)
                number_of_links++;
        }
        XBT_DEBUG("Number of nodes in Cluster_nodes: %d",Cluster_nodes.GetN());
-
 }
 
 void * ns3_add_AS(char * id)
@@ -199,7 +220,7 @@ void * ns3_add_AS(char * id)
 
 static char* transformIpv4Address (Ipv4Address from){
        std::stringstream sstream;
-               sstream << interfaces.GetAddress(interfaces.GetN()-2);
+               sstream << from ;
                std::string s = sstream.str();
                size_t size = s.size() + 1;
                char* IPaddr = bprintf("%s",s.c_str());
@@ -233,9 +254,11 @@ void * ns3_add_link(int src,int dst,char * bw,char * lat)
        free(adr);
        interfaces.Add(address.Assign (netA));
 
+       XBT_DEBUG("Have write '%s' for Node '%d'",transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2)),src);
        xbt_dynar_set(IPV4addr,src,
                        transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2)));
 
+       XBT_DEBUG("Have write '%s' for Node '%d'",transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1)),dst);
        xbt_dynar_set(IPV4addr,dst,
                        transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1)));