Update ns3 source files to don't use surfxml variables.

diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c
index a089531..8a114b8 100644 (file)
--- a/src/surf/network_ns3.c
+++ b/src/surf/network_ns3.c
@@ -54,11 +54,11 @@ static void replace_lat_ns3(char ** lat)
 
 static void parse_ns3_add_host(sg_platf_host_cbarg_t host)
 {
-  XBT_DEBUG("NS3_ADD_HOST '%s'",A_surfxml_host_id);
+  XBT_DEBUG("NS3_ADD_HOST '%s'",host->id);
   xbt_lib_set(host_lib,
-              A_surfxml_host_id,
+              host->id,
               NS3_HOST_LEVEL,
-              ns3_add_host(A_surfxml_host_id)
+              ns3_add_host(host->id)
     );
 }
 
@@ -68,9 +68,9 @@ static void ns3_free_dynar(void * elmts)
   return;
 }
 
-static void parse_ns3_add_link(sg_platf_link_cbarg_t l)
+static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
 {
-  XBT_DEBUG("NS3_ADD_LINK '%s'",A_surfxml_link_id);
+  XBT_DEBUG("NS3_ADD_LINK '%s'",link->id);
 
   if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),ns3_free_dynar);
 
@@ -78,9 +78,9 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t l)
   tmgr_trace_t state_trace;
   tmgr_trace_t lat_trace;
 
-  bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
-  lat_trace = tmgr_trace_new(A_surfxml_link_latency_file);
-  state_trace = tmgr_trace_new(A_surfxml_link_state_file);
+  bw_trace = link->bandwidth_trace;
+  lat_trace = link->latency_trace;
+  state_trace = link->state_trace;
 
   if (bw_trace)
     XBT_INFO("The NS3 network model doesn't support bandwidth state traces");
@@ -90,50 +90,50 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t l)
     XBT_INFO("The NS3 network model doesn't support link state traces");
 
   ns3_link_t link_ns3 = xbt_new0(s_ns3_link_t,1);;
-  link_ns3->id = xbt_strdup(A_surfxml_link_id);
-  link_ns3->bdw = xbt_strdup(A_surfxml_link_bandwidth);
-  link_ns3->lat = xbt_strdup(A_surfxml_link_latency);
-
-  surf_ns3_link_t link = xbt_new0(s_surf_ns3_link_t,1);
-  link->generic_resource.name = xbt_strdup(A_surfxml_link_id);
-  link->generic_resource.properties = current_property_set;
-  link->data = link_ns3;
-  link->created = 1;
-
-  xbt_lib_set(link_lib,A_surfxml_link_id,NS3_LINK_LEVEL,link_ns3);
-  xbt_lib_set(link_lib,A_surfxml_link_id,SURF_LINK_LEVEL,link);
+  link_ns3->id = (char*)(link->id);
+  link_ns3->bdw = bprintf("%f",link->bandwidth);
+  link_ns3->lat = bprintf("%f",link->latency);
+
+  surf_ns3_link_t l = xbt_new0(s_surf_ns3_link_t,1);
+  l->generic_resource.name = xbt_strdup(link->id);
+  l->generic_resource.properties = current_property_set;
+  l->data = link_ns3;
+  l->created = 1;
+
+  xbt_lib_set(link_lib,link->id,NS3_LINK_LEVEL,link_ns3);
+  xbt_lib_set(link_lib,link->id,SURF_LINK_LEVEL,l);
 }
 
 static void parse_ns3_add_router(sg_platf_router_cbarg_t router)
 {
-  XBT_DEBUG("NS3_ADD_ROUTER '%s'",A_surfxml_router_id);
+  XBT_DEBUG("NS3_ADD_ROUTER '%s'",router->id);
   xbt_lib_set(as_router_lib,
-              A_surfxml_router_id,
+              router->id,
               NS3_ASR_LEVEL,
-              ns3_add_router(A_surfxml_router_id)
+              ns3_add_router(router->id)
     );
 }
 
 static void parse_ns3_add_AS(const char*id, const char*routing)
 {
-  XBT_DEBUG("NS3_ADD_AS '%s'",A_surfxml_AS_id);
+  XBT_DEBUG("NS3_ADD_AS '%s'",id);
   xbt_lib_set(as_router_lib,
-              A_surfxml_AS_id,
+              id,
               NS3_ASR_LEVEL,
-              ns3_add_AS(A_surfxml_AS_id)
+              ns3_add_AS(id)
     );
 }
 
 static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
 {
-  char *cluster_prefix = A_surfxml_cluster_prefix;
-  char *cluster_suffix = A_surfxml_cluster_suffix;
-  char *cluster_radical = A_surfxml_cluster_radical;
-  char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
-  char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
-  char *cluster_bw = A_surfxml_cluster_bw;
-  char *cluster_lat = A_surfxml_cluster_lat;
-  char *groups = NULL;
+  const char *cluster_prefix = cluster->prefix;
+  const char *cluster_suffix = cluster->suffix;
+  const char *cluster_radical = cluster->radical;
+  const char *cluster_bb_bw = bprintf("%f",cluster->bb_bw);
+  const char *cluster_bb_lat = bprintf("%f",cluster->bb_lat);
+  const char *cluster_bw = bprintf("%f",cluster->bw);
+  const char *cluster_lat = bprintf("%f",cluster->lat);
+  const char *groups = NULL;
 
   int start, end, i;
   unsigned int iter;
@@ -218,7 +218,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
   bw =  xbt_strdup(cluster_bb_bw);
   replace_lat_ns3(&lat);
   replace_bdw_ns3(&bw);
-  ns3_add_cluster(bw,lat,A_surfxml_cluster_id);
+  ns3_add_cluster(bw,lat,cluster->id);
   xbt_free(lat);
   xbt_free(bw);        
 }

diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc
index 21eb92a..b6e5b6e 100644 (file)
--- a/src/surf/ns3/ns3_interface.cc
+++ b/src/surf/ns3/ns3_interface.cc
@@ -124,7 +124,7 @@ int ns3_initialize(const char* TcpProtocol){
   XBT_ERROR("The ns3/TcpModel must be : NewReno or Reno or Tahoe");
 }
 
-void * ns3_add_host(char * id)
+void * ns3_add_host(const char * id)
 {
        ns3_nodes_t host  = xbt_new0(s_ns3_nodes_t,1);
        XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id);
@@ -138,7 +138,7 @@ void * ns3_add_host(char * id)
        return host;
 }
 
-void * ns3_add_host_cluster(char * id)
+void * ns3_add_host_cluster(const char * id)
 {
        ns3_nodes_t host  = xbt_new0(s_ns3_nodes_t,1);
        XBT_DEBUG("Interface ns3 add host[%d] '%s'",number_of_nodes,id);
@@ -153,7 +153,7 @@ void * ns3_add_host_cluster(char * id)
        return host;
 }
 
-void * ns3_add_router(char * id)
+void * ns3_add_router(const char * id)
 {
        ns3_nodes_t router  = xbt_new0(s_ns3_nodes_t,1);
        XBT_DEBUG("Interface ns3 add router[%d] '%s'",number_of_nodes,id);
@@ -167,7 +167,7 @@ void * ns3_add_router(char * id)
        return router;
 }
 
-void * ns3_add_cluster(char * bw,char * lat,char *id)
+void * ns3_add_cluster(char * bw,char * lat,const char *id)
 {
 
        XBT_DEBUG("cluster_id: %s",id);
@@ -212,7 +212,7 @@ void * ns3_add_cluster(char * bw,char * lat,char *id)
        XBT_DEBUG("Number of nodes in Cluster_nodes: %d",Cluster_nodes.GetN());
 }
 
-void * ns3_add_AS(char * id)
+void * ns3_add_AS(const char * id)
 {
        XBT_DEBUG("Interface ns3 add AS '%s'",id);
        return NULL;

diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.h
index 15f847d..746c434 100644 (file)
--- a/src/surf/ns3/ns3_interface.h
+++ b/src/surf/ns3/ns3_interface.h
@@ -38,15 +38,15 @@ XBT_PUBLIC(void*)  ns3_get_socket_action(void *socket);
 XBT_PUBLIC(double) ns3_get_socket_remains(void *socket);
 XBT_PUBLIC(double) ns3_get_socket_sent(void *socket);
 XBT_PUBLIC(char)   ns3_get_socket_is_finished(void *socket);
-XBT_PUBLIC(void *) ns3_add_host(char * id);
-XBT_PUBLIC(void *) ns3_add_host_cluster(char * id);
-XBT_PUBLIC(void *) ns3_add_router(char * id);
-XBT_PUBLIC(void *) ns3_add_AS(char * id);
+XBT_PUBLIC(void *) ns3_add_host(const char * id);
+XBT_PUBLIC(void *) ns3_add_host_cluster(const char * id);
+XBT_PUBLIC(void *) ns3_add_router(const char * id);
+XBT_PUBLIC(void *) ns3_add_AS(const char * id);
 XBT_PUBLIC(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);
 XBT_PUBLIC(void *) ns3_end_platform(void);
-XBT_PUBLIC(void *) ns3_add_cluster(char * bw,char * lat,char *id);
+XBT_PUBLIC(void *) ns3_add_cluster(char * bw,char * lat,const char *id);
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc
index 5e2c108..d0f68f2 100644 (file)
--- a/src/surf/ns3/ns3_simulator.cc
+++ b/src/surf/ns3/ns3_simulator.cc
@@ -109,7 +109,7 @@ double NS3Sim::get_sent_from_socket(void *socket){
 void NS3Sim::simulator_start(double min){
   if(min > 0.0)
     Simulator::Stop(Seconds(min));
-  XBT_DEBUG("Start simulator");
+  XBT_DEBUG("Start simulator '%f'",min);
   Simulator::Run ();
 }