From 41fc8c54b8e9e4c610a8e54791d8efa8c5e6129e Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 7 Feb 2016 21:28:51 +0100 Subject: [PATCH] first round of cleanups in the NS3 network --- src/surf/network_cm02.cpp | 17 ++++----- src/surf/network_ns3.cpp | 69 +++++++++++------------------------ src/surf/network_ns3.hpp | 5 --- src/surf/ns3/ns3_interface.cc | 2 +- 4 files changed, 30 insertions(+), 63 deletions(-) diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 5b672e7494..2e503cc550 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -517,12 +517,9 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_ lmm_system_t system, double constraint_value, sg_future_evt_set_t fes, - int initiallyOn, - tmgr_trace_t state_trace, - double metric_peak, - tmgr_trace_t metric_trace, - double lat_initial, - tmgr_trace_t lat_trace, + int initiallyOn, tmgr_trace_t state_trace, + double bw_peak, tmgr_trace_t bw_trace, + double lat_initial, tmgr_trace_t lat_trace, e_surf_link_sharing_policy_t policy) : Link(model, name, props, lmm_constraint_new(system, this, constraint_value), fes, state_trace) { @@ -532,15 +529,15 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_ turnOff(); p_speed.scale = 1.0; - p_speed.peak = metric_peak; - if (metric_trace) - p_speed.event = fes->add_trace(metric_trace, 0.0, this); + p_speed.peak = bw_peak; + if (bw_trace) + p_speed.event = fes->add_trace(bw_trace, 0.0, this); else p_speed.event = NULL; m_latCurrent = lat_initial; if (lat_trace) - p_latEvent = fes->add_trace(lat_trace, 0.0, this); + p_latEvent = fes->add_trace(lat_trace, 0.0, this); if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(getConstraint()); diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 9063b50303..5675e730b0 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -23,23 +23,6 @@ extern xbt_dict_t dict_socket; * Callbacks * *************/ -static void replace_bdw_ns3(char ** bdw) -{ - char *temp = xbt_strdup(*bdw); - xbt_free(*bdw); - *bdw = bprintf("%fBps",atof(temp)); - xbt_free(temp); - -} - -static void replace_lat_ns3(char ** lat) -{ - char *temp = xbt_strdup(*lat); - xbt_free(*lat); - *lat = bprintf("%fs",atof(temp)); - xbt_free(temp); -} - static void simgrid_ns3_add_host(simgrid::s4u::Host& host) { const char* id = host.name().c_str(); @@ -84,13 +67,6 @@ static void parse_ns3_add_AS(simgrid::surf::As* as) static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) { - 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; @@ -102,7 +78,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) char *router_id,*host_id; - radical_elements = xbt_str_split(cluster_radical, ","); + radical_elements = xbt_str_split(cluster->radical, ","); xbt_dynar_foreach(radical_elements, iter, groups) { radical_ends = xbt_str_split(groups, "-"); @@ -110,7 +86,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) case 1: start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); xbt_dynar_push_as(tab_elements_num, int, start); - router_id = bprintf("ns3_%s%d%s", cluster_prefix, start, cluster_suffix); + router_id = bprintf("ns3_%s%d%s", cluster->prefix, start, cluster->suffix); simgrid::s4u::Host::by_name_or_create(router_id) ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id)); XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id); @@ -122,7 +98,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *)); for (i = start; i <= end; i++){ xbt_dynar_push_as(tab_elements_num, int, i); - router_id = bprintf("ns3_%s%d%s", cluster_prefix, i, cluster_suffix); + router_id = bprintf("ns3_%s%d%s", cluster->prefix, i, cluster->suffix); simgrid::s4u::Host::by_name_or_create(router_id) ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id)); XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id); @@ -138,15 +114,13 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) //Create links unsigned int cpt; int elmts; - char * lat = xbt_strdup(cluster_lat); - char * bw = xbt_strdup(cluster_bw); - replace_lat_ns3(&lat); - replace_bdw_ns3(&bw); + char * lat = bprintf("%fs", cluster->lat); + char * bw = bprintf("%fBps", cluster->bw); xbt_dynar_foreach(tab_elements_num,cpt,elmts) { - host_id = bprintf("%s%d%s", cluster_prefix, elmts, cluster_suffix); - router_id = bprintf("ns3_%s%d%s", cluster_prefix, elmts, cluster_suffix); + host_id = bprintf("%s%d%s", cluster->prefix, elmts, cluster->suffix); + router_id = bprintf("ns3_%s%d%s", cluster->prefix, elmts, cluster->suffix); XBT_DEBUG("Create link from '%s' to '%s'",host_id,router_id); ns3_nodes_t host_src = ns3_find_host(host_id); @@ -162,14 +136,14 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) free(router_id); free(host_id); } + xbt_free(lat); + xbt_free(bw); xbt_dynar_free(&tab_elements_num); //Create link backbone - lat = xbt_strdup(cluster_bb_lat); - bw = xbt_strdup(cluster_bb_bw); - replace_lat_ns3(&lat); - replace_bdw_ns3(&bw); + lat = bprintf("%fs", cluster->bb_lat); + bw = bprintf("%fBps", cluster->bb_bw); ns3_add_cluster(bw,lat,cluster->id); xbt_free(lat); xbt_free(bw); @@ -198,10 +172,8 @@ static void create_ns3_topology(void) if (strcmp(src,dst) && link->m_created){ XBT_DEBUG("Route from '%s' to '%s' with link '%s'", src, dst, link->getName()); - char * link_bdw = xbt_strdup(link->p_bdw); - char * link_lat = xbt_strdup(link->p_lat); - replace_lat_ns3(&link_lat); - replace_bdw_ns3(&link_bdw); + char * link_bdw = bprintf("%fBps", link->getBandwidth()); + char * link_lat = bprintf("%fs", link->getLatency()); link->m_created = 0; // XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id); @@ -209,12 +181,14 @@ static void create_ns3_topology(void) //create link ns3 ns3_nodes_t host_src = ns3_find_host(src); - if(!host_src) host_src = static_cast(xbt_lib_get_or_null(as_router_lib,src,NS3_ASR_LEVEL)); + if (!host_src) + host_src = static_cast(xbt_lib_get_or_null(as_router_lib,src,NS3_ASR_LEVEL)); ns3_nodes_t host_dst = ns3_find_host(dst); - if(!host_dst) host_dst = static_cast(xbt_lib_get_or_null(as_router_lib,dst,NS3_ASR_LEVEL)); + if(!host_dst) + host_dst = static_cast(xbt_lib_get_or_null(as_router_lib,dst,NS3_ASR_LEVEL)); - if(host_src && host_dst){} - else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num); + if (!host_src || !host_dst) + xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num); ns3_add_link(host_src->node_num,host_src->type,host_dst->node_num,host_dst->type,link_bdw,link_lat); @@ -417,10 +391,11 @@ void NetworkNS3Model::updateActionsState(double now, double delta) NetworkNS3Link::NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props, double bw_initial, double lat_initial) : Link(model, name, props) - , p_lat(bprintf("%f", lat_initial)) - , p_bdw(bprintf("%f", bw_initial)) , m_created(1) { + p_speed.scale = 1.0; + p_speed.peak = bw_initial; + m_latCurrent = lat_initial; } NetworkNS3Link::~NetworkNS3Link() diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index 0393388d0a..57c31ab7d5 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -71,15 +71,10 @@ public: ~NetworkNS3Link(); void updateState(tmgr_trace_iterator_t event_type, double value, double date); - double getLatency(){THROW_UNIMPLEMENTED;} - double getBandwidth(){THROW_UNIMPLEMENTED;} void updateBandwidth(double value, double date=surf_get_clock()){THROW_UNIMPLEMENTED;} void updateLatency(double value, double date=surf_get_clock()){THROW_UNIMPLEMENTED;} //private: - char *p_id; - char *p_lat; - char *p_bdw; int m_created; }; diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc index 3b516ff07f..4507c9d811 100644 --- a/src/surf/ns3/ns3_interface.cc +++ b/src/surf/ns3/ns3_interface.cc @@ -227,7 +227,7 @@ static char* transformIpv4Address (Ipv4Address from){ 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) + char *bw, char *lat) { if(number_of_links == 1 ) { LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_INFO); -- 2.20.1