From 1ee06836f97375c683e9e31d24ff77fb258b453b Mon Sep 17 00:00:00 2001 From: Navarrop Date: Fri, 29 Jul 2011 14:42:05 +0200 Subject: [PATCH 1/1] Add platforms for ns3. Changed units to be compliant with ns3 ones. (bps =! Bps) --- examples/msg/ns3/3hosts_2links_d.xml | 15 ++++++ examples/msg/ns3/3hosts_2links_p.xml | 27 ++++++++++ .../msg/ns3/{onelink-d.xml => 3links-d.xml} | 0 .../msg/ns3/{onelink-p.xml => 3links-p.xml} | 11 ++++- examples/msg/ns3/One_cluster-d.xml | 15 ++++++ examples/msg/ns3/One_cluster.xml | 19 +++++++ examples/msg/ns3/Two_clusters-d.xml | 15 ++++++ examples/msg/ns3/Two_clusters.xml | 49 +++++++++++++++++++ src/surf/network_ns3.c | 27 +++++++--- src/surf/ns3/ns3_interface.cc | 7 +-- src/surf/ns3/ns3_simulator.cc | 1 - 11 files changed, 175 insertions(+), 11 deletions(-) create mode 100644 examples/msg/ns3/3hosts_2links_d.xml create mode 100644 examples/msg/ns3/3hosts_2links_p.xml rename examples/msg/ns3/{onelink-d.xml => 3links-d.xml} (100%) rename examples/msg/ns3/{onelink-p.xml => 3links-p.xml} (88%) create mode 100644 examples/msg/ns3/One_cluster-d.xml create mode 100644 examples/msg/ns3/One_cluster.xml create mode 100644 examples/msg/ns3/Two_clusters-d.xml create mode 100644 examples/msg/ns3/Two_clusters.xml diff --git a/examples/msg/ns3/3hosts_2links_d.xml b/examples/msg/ns3/3hosts_2links_d.xml new file mode 100644 index 0000000000..3314218805 --- /dev/null +++ b/examples/msg/ns3/3hosts_2links_d.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/examples/msg/ns3/3hosts_2links_p.xml b/examples/msg/ns3/3hosts_2links_p.xml new file mode 100644 index 0000000000..0e6aa55b86 --- /dev/null +++ b/examples/msg/ns3/3hosts_2links_p.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/msg/ns3/onelink-d.xml b/examples/msg/ns3/3links-d.xml similarity index 100% rename from examples/msg/ns3/onelink-d.xml rename to examples/msg/ns3/3links-d.xml diff --git a/examples/msg/ns3/onelink-p.xml b/examples/msg/ns3/3links-p.xml similarity index 88% rename from examples/msg/ns3/onelink-p.xml rename to examples/msg/ns3/3links-p.xml index b05e780dce..647b29ef55 100644 --- a/examples/msg/ns3/onelink-p.xml +++ b/examples/msg/ns3/3links-p.xml @@ -1,8 +1,17 @@ - + + + diff --git a/examples/msg/ns3/One_cluster-d.xml b/examples/msg/ns3/One_cluster-d.xml new file mode 100644 index 0000000000..ff7e71f9fd --- /dev/null +++ b/examples/msg/ns3/One_cluster-d.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/examples/msg/ns3/One_cluster.xml b/examples/msg/ns3/One_cluster.xml new file mode 100644 index 0000000000..a638eae8f3 --- /dev/null +++ b/examples/msg/ns3/One_cluster.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/examples/msg/ns3/Two_clusters-d.xml b/examples/msg/ns3/Two_clusters-d.xml new file mode 100644 index 0000000000..2921183399 --- /dev/null +++ b/examples/msg/ns3/Two_clusters-d.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/examples/msg/ns3/Two_clusters.xml b/examples/msg/ns3/Two_clusters.xml new file mode 100644 index 0000000000..03810af1d5 --- /dev/null +++ b/examples/msg/ns3/Two_clusters.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c index ea514d3805..8777c009f7 100644 --- a/src/surf/network_ns3.c +++ b/src/surf/network_ns3.c @@ -17,6 +17,8 @@ extern xbt_lib_t as_router_lib; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_ns3, surf, "Logging specific to the SURF network NS3 module"); +#define MAX_LENGHT_IPV4 16 //255.255.255.255\0 + extern routing_global_t global_routing; extern xbt_dict_t dict_socket; @@ -54,7 +56,7 @@ static void replace_bdw_ns3(char * bdw) { char *temp = xbt_strdup(bdw); xbt_free(bdw); - bdw = bprintf("%fbps",atof(temp)); + bdw = bprintf("%fBps",atof(temp)); xbt_free(temp); } @@ -76,11 +78,18 @@ void parse_ns3_add_host(void) ns3_add_host(A_surfxml_host_id) ); } + +static void ns3_free_dynar(void * elmts){ + if(elmts) + free(elmts); + return; +} + void parse_ns3_add_link(void) { XBT_DEBUG("NS3_ADD_LINK '%s'",A_surfxml_link_id); - if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),free); + if(!IPV4addr) IPV4addr = xbt_dynar_new(MAX_LENGHT_IPV4*sizeof(char),ns3_free_dynar); tmgr_trace_t bw_trace; tmgr_trace_t state_trace; @@ -188,8 +197,6 @@ void parse_ns3_add_cluster(void) } } - - //Create links unsigned int cpt; int elmts; @@ -258,6 +265,8 @@ void create_ns3_topology() { XBT_DEBUG("Starting topology generation"); + xbt_dynar_shrink(IPV4addr,0); + //get the onelinks from the parsed platform xbt_dynar_t onelink_routes = global_routing->get_onelink_routes(); if (!onelink_routes) @@ -273,8 +282,10 @@ void create_ns3_topology() if( strcmp(src,dst) && ((surf_ns3_link_t)link)->created){ XBT_DEBUG("Route from '%s' to '%s' with link '%s'",src,dst,((surf_ns3_link_t)link)->data->id); - char * link_bdw = bprintf("%sBps",((surf_ns3_link_t)link)->data->bdw); - char * link_lat = bprintf("%ss",(((surf_ns3_link_t)link)->data->lat)); + char * link_bdw = bprintf("%s",((surf_ns3_link_t)link)->data->bdw); + char * link_lat = bprintf("%s",(((surf_ns3_link_t)link)->data->lat)); + replace_lat_ns3(link_lat); + replace_bdw_ns3(link_bdw); ((surf_ns3_link_t)link)->created = 0; // XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id); @@ -400,6 +411,10 @@ static double ns3_share_resources(double min) ns3_simulator(min); time_to_next_flow_completion = ns3_time() - surf_get_clock(); +// XBT_INFO("min : %f",min); +// XBT_INFO("ns3 time : %f",ns3_time()); +// XBT_INFO("surf time : %f",surf_get_clock()); + xbt_assert(time_to_next_flow_completion, "Time to next flow completion not initialized!\n"); diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc index 8fcc51e0bf..03ddec0d8e 100644 --- a/src/surf/ns3/ns3_interface.cc +++ b/src/surf/ns3/ns3_interface.cc @@ -74,7 +74,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, @@ -188,7 +188,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 +198,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 +232,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))); diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc index 41ef6345ab..a1dd0ed68c 100644 --- a/src/surf/ns3/ns3_simulator.cc +++ b/src/surf/ns3/ns3_simulator.cc @@ -122,7 +122,6 @@ static void send_callback(Ptr localSocket, uint32_t txSpace){ toWrite = min (toWrite, localSocket->GetTxAvailable ()); int amountSent = localSocket->Send (&data[0], toWrite, 0); -// cout << Simulator::Now () << " AmountSend: " << amountSent << " Towrite: " << toWrite << endl; if(amountSent < 0) return; (mysocket->sentBytes) += amountSent; -- 2.20.1