Implement RED module for ns3 into simgrid code.

[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 03ddec0..21eb92a 100644 (file)
--- a/src/surf/ns3/ns3_interface.cc
+++ b/src/surf/ns3/ns3_interface.cc
@@ -10,13 +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;
 
@@ -32,8 +25,6 @@ NodeContainer nodes;
 NodeContainer Cluster_nodes;
 Ipv4InterfaceContainer interfaces;
 
-
-
 int number_of_nodes = 0;
 int number_of_clusters_nodes = 0;
 int number_of_links = 1;
@@ -43,8 +34,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 +45,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();
 }
@@ -72,7 +65,7 @@ int ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalByte
        Ptr<Node> src_node = nodes.Get(node1->node_num);
        Ptr<Node> dst_node = nodes.Get(node2->node_num);
 
-       char* addr = (char*)xbt_dynar_get_ptr(IPV4addr,node2->node_num);
+       char* addr = (char*)xbt_dynar_get_as(IPV4addr,node2->node_num,char*);
 
        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,
@@ -97,10 +90,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 (1024)); // 1024-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)
@@ -177,6 +198,7 @@ void * ns3_add_cluster(char * bw,char * lat,char *id)
        XBT_DEBUG("Assign IP Addresses %s to CSMA.",adr);
        Ipv4AddressHelper ipv4;
        ipv4.SetBase (adr, "255.255.0.0");
+       free(adr);
        interfaces.Add(ipv4.Assign (devices));
 
        if(number_of_links == 255){
@@ -200,19 +222,21 @@ static char* transformIpv4Address (Ipv4Address from){
        std::stringstream sstream;
                sstream << from ;
                std::string s = sstream.str();
-               size_t size = s.size() + 1;
-               char* IPaddr = bprintf("%s",s.c_str());
-               return IPaddr;
+               return bprintf("%s",s.c_str());
 }
 
-void * ns3_add_link(int src,int dst,char * bw,char * lat)
+void * ns3_add_link(int src, e_ns3_network_element_type_t type_src,
+                                       int dst, e_ns3_network_element_type_t type_dst,
+                                       char * bw,char * lat)
 {
        if(number_of_links == 1 ) {
                LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_INFO);
                LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO);
        }
 
-       PointToPointHelper pointToPoint;
+
+       MyPointToPointHelper pointToPoint;
+
        NetDeviceContainer netA;
        Ipv4AddressHelper address;
 
@@ -224,7 +248,7 @@ void * ns3_add_link(int src,int dst,char * bw,char * lat)
        pointToPoint.SetChannelAttribute ("Delay", StringValue (lat));
        //pointToPoint.EnablePcapAll("test_ns3_trace"); //DEBUG
 
-       netA.Add(pointToPoint.Install (a, b));
+       netA.Add(pointToPoint.Install (a, type_src, b, type_dst));
 
        char * adr = bprintf("%d.%d.0.0",number_of_networks,number_of_links);
        address.SetBase (adr, "255.255.0.0");
@@ -232,13 +256,13 @@ 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)));
+       char *tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2));
+       xbt_dynar_set_as(IPV4addr,src,char*,tmp);
+       XBT_DEBUG("Have write '%s' for Node '%d'",(char*)xbt_dynar_get_as(IPV4addr,src,char*),src);
 
-       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)));
+       tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1));
+       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)