X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5cafe2f3ba05448e2c932bccbe4acd809d7295ec..41fc8c54b8e9e4c610a8e54791d8efa8c5e6129e:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 78394c5432..5675e730b0 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -1,54 +1,33 @@ -/* Copyright (c) 2007-2014. The SimGrid Team. +/* Copyright (c) 2007-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "network_ns3.hpp" -#include "surf_private.h" +#include "src/surf/network_ns3.hpp" +#include "src/surf/surf_private.h" +#include "src/surf/host_interface.hpp" #include "simgrid/sg_config.h" +#include "src/surf/platform.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_ns3, surf, - "Logging specific to the SURF network NS3 module"); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3); -extern xbt_lib_t host_lib; -extern xbt_lib_t link_lib; -extern xbt_lib_t as_router_lib; - -extern xbt_dict_t dict_socket; +int NS3_EXTENSION_ID; xbt_dynar_t IPV4addr; static double time_to_next_flow_completion = -1; +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 parse_ns3_add_host(sg_platf_host_cbarg_t host) +static void simgrid_ns3_add_host(simgrid::s4u::Host& host) { - XBT_DEBUG("NS3_ADD_HOST '%s'",host->id); - xbt_lib_set(host_lib, - host->id, - NS3_HOST_LEVEL, - ns3_add_host(host->id) - ); + const char* id = host.name().c_str(); + XBT_DEBUG("NS3_ADD_HOST '%s'", id); + host.extension_set(NS3_EXTENSION_ID, ns3_add_host(id)); } static void parse_ns3_add_link(sg_platf_link_cbarg_t link) @@ -57,47 +36,37 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link) if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),free); - NetworkLinkPtr net_link = surf_network_model->createNetworkLink(link->id, + surf_network_model->createLink(link->id, link->bandwidth, link->bandwidth_trace, link->latency, link->latency_trace, - link->state, + link->initiallyOn, link->state_trace, link->policy, link->properties); - xbt_lib_set(link_lib, link->id, SURF_LINK_LEVEL, net_link); } -static void parse_ns3_add_router(sg_platf_router_cbarg_t router) +static void simgrid_ns3_add_router(simgrid::surf::NetCard* router) { - XBT_DEBUG("NS3_ADD_ROUTER '%s'",router->id); + const char* router_id = router->getName(); + XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id); xbt_lib_set(as_router_lib, - router->id, + router_id, NS3_ASR_LEVEL, - ns3_add_router(router->id) + ns3_add_router(router_id) ); } -static void parse_ns3_add_AS(sg_platf_AS_cbarg_t AS) +static void parse_ns3_add_AS(simgrid::surf::As* as) { - XBT_DEBUG("NS3_ADD_AS '%s'",AS->id); - xbt_lib_set(as_router_lib, - AS->id, - NS3_ASR_LEVEL, - ns3_add_AS(AS->id) - ); + const char* as_id = as->p_name; + XBT_DEBUG("NS3_ADD_AS '%s'", as_id); + xbt_lib_set(as_router_lib, as_id, NS3_ASR_LEVEL, ns3_add_AS(as_id) ); } 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; @@ -109,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, "-"); @@ -117,12 +86,9 @@ 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); - xbt_lib_set(host_lib, - router_id, - NS3_HOST_LEVEL, - ns3_add_host_cluster(router_id) - ); + 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); free(router_id); break; @@ -132,12 +98,9 @@ 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); - xbt_lib_set(host_lib, - router_id, - NS3_HOST_LEVEL, - ns3_add_host_cluster(router_id) - ); + 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); free(router_id); } @@ -151,19 +114,17 @@ 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 = static_cast(xbt_lib_get_or_null(host_lib,host_id, NS3_HOST_LEVEL)); - ns3_nodes_t host_dst = static_cast(xbt_lib_get_or_null(host_lib,router_id,NS3_HOST_LEVEL)); + ns3_nodes_t host_src = ns3_find_host(host_id); + ns3_nodes_t host_dst = ns3_find_host(router_id); if(host_src && host_dst){} else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num); @@ -175,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); @@ -201,32 +162,33 @@ static void create_ns3_topology(void) xbt_die("There is no routes!"); XBT_DEBUG("Have get_onelink_routes, found %ld routes",onelink_routes->used); //save them in trace file - OnelinkPtr onelink; + simgrid::surf::Onelink *onelink; unsigned int iter; xbt_dynar_foreach(onelink_routes, iter, onelink) { char *src = onelink->p_src->getName(); char *dst = onelink->p_dst->getName(); - NetworkNS3LinkPtr link = static_cast(onelink->p_link); + simgrid::surf::NetworkNS3Link *link = + static_cast(onelink->p_link); 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); XBT_DEBUG("\tLink (%s) bdw:%s lat:%s", link->getName(), link_bdw, link_lat); //create link ns3 - ns3_nodes_t host_src = static_cast(xbt_lib_get_or_null(host_lib,src,NS3_HOST_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 = static_cast(xbt_lib_get_or_null(host_lib,dst,NS3_HOST_LEVEL)); - if(!host_dst) host_dst = static_cast(xbt_lib_get_or_null(as_router_lib,dst,NS3_ASR_LEVEL)); + 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)); + 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_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); @@ -243,13 +205,13 @@ static void parse_ns3_end_platform(void) static void define_callbacks_ns3(void) { - sg_platf_host_add_cb (&parse_ns3_add_host); - sg_platf_router_add_cb (&parse_ns3_add_router); - sg_platf_link_add_cb (&parse_ns3_add_link); - sg_platf_cluster_add_cb (&parse_ns3_add_cluster); - sg_platf_AS_begin_add_cb (&parse_ns3_add_AS); - sg_platf_postparse_add_cb(&create_ns3_topology); //get_one_link_routes - sg_platf_postparse_add_cb(&parse_ns3_end_platform); //InitializeRoutes + simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host); + simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_router); + simgrid::surf::on_link.connect (&parse_ns3_add_link); + simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster); + simgrid::surf::asCreatedCallbacks.connect(parse_ns3_add_AS); + simgrid::surf::on_postparse.connect(&create_ns3_topology); //get_one_link_routes + simgrid::surf::on_postparse.connect(&parse_ns3_end_platform); //InitializeRoutes } /********* @@ -257,7 +219,7 @@ static void define_callbacks_ns3(void) *********/ static void free_ns3_link(void * elmts) { - delete static_cast(elmts); + delete static_cast(elmts); } static void free_ns3_host(void * elmts) @@ -271,21 +233,23 @@ void surf_network_model_init_NS3() if (surf_network_model) return; - surf_network_model = new NetworkNS3Model(); + surf_network_model = new simgrid::surf::NetworkNS3Model(); - xbt_dynar_push(model_list, &surf_network_model); + xbt_dynar_push(all_existing_models, &surf_network_model); } -NetworkNS3Model::NetworkNS3Model() : NetworkModel("network NS3") { +namespace simgrid { +namespace surf { + +NetworkNS3Model::NetworkNS3Model() : NetworkModel() { if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) { xbt_die("Impossible to initialize NS3 interface"); } routing_model_create(NULL); define_callbacks_ns3(); - NS3_HOST_LEVEL = xbt_lib_add_level(host_lib,(void_f_pvoid_t)free_ns3_host); - NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib,(void_f_pvoid_t)free_ns3_host); - NS3_LINK_LEVEL = xbt_lib_add_level(link_lib,(void_f_pvoid_t)free_ns3_link); + NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(free_ns3_host); + NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, free_ns3_host); } NetworkNS3Model::~NetworkNS3Model() { @@ -294,46 +258,45 @@ NetworkNS3Model::~NetworkNS3Model() { xbt_dict_free(&dict_socket); } -NetworkLinkPtr NetworkNS3Model::createNetworkLink(const char *name, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t policy, - xbt_dict_t properties){ +Link* NetworkNS3Model::createLink(const char *name, + double bw_initial, + tmgr_trace_t bw_trace, + double lat_initial, + tmgr_trace_t lat_trace, + int initiallyOn, + tmgr_trace_t state_trace, + e_surf_link_sharing_policy_t policy, + xbt_dict_t properties){ if (bw_trace) XBT_INFO("The NS3 network model doesn't support bandwidth state traces"); if (lat_trace) XBT_INFO("The NS3 network model doesn't support latency state traces"); if (state_trace) XBT_INFO("The NS3 network model doesn't support link state traces"); - return new NetworkNS3Link(this, name, properties, bw_initial, lat_initial); + Link* link = new NetworkNS3Link(this, name, properties, bw_initial, lat_initial); + Link::onCreation(link); + return link; } -xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdgePtr src, RoutingEdgePtr dst) +xbt_dynar_t NetworkNS3Model::getRoute(NetCard *src, NetCard *dst) { xbt_dynar_t route = NULL; - routing_get_route_and_latency(src, dst, &route, NULL); - //routing_platf->getRouteAndLatency(src, dst, &route, NULL); + routing_platf->getRouteAndLatency(src, dst, &route, NULL); return route; } -ActionPtr NetworkNS3Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, - double size, double rate) +Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, + double size, double rate) { XBT_DEBUG("Communicate from %s to %s", src->getName(), dst->getName()); - NetworkNS3ActionPtr action = new NetworkNS3Action(this, size, 0); + NetworkNS3Action *action = new NetworkNS3Action(this, size, 0); ns3_create_flow(src->getName(), dst->getName(), surf_get_clock(), size, action); -#ifdef HAVE_TRACING action->m_lastSent = 0; action->p_srcElm = src; action->p_dstElm = dst; -#endif - surf_callback_emit(networkCommunicateCallbacks, action, src, dst, size, rate); + networkCommunicateCallbacks(action, src, dst, size, rate); return (surf_action_t) action; } @@ -376,33 +339,31 @@ void NetworkNS3Model::updateActionsState(double now, double delta) return; } - NetworkNS3ActionPtr action; + NetworkNS3Action *action; xbt_dict_foreach(dict_socket,cursor,key,data){ - action = static_cast(ns3_get_socket_action(data)); + action = static_cast(ns3_get_socket_action(data)); XBT_DEBUG("Processing socket %p (action %p)",data,action); action->setRemains(action->getCost() - ns3_get_socket_sent(data)); - #ifdef HAVE_TRACING - if (TRACE_is_enabled() && - action->getState() == SURF_ACTION_RUNNING){ - double data_sent = ns3_get_socket_sent(data); - double data_delta_sent = data_sent - action->m_lastSent; - - xbt_dynar_t route = NULL; - - routing_get_route_and_latency (action->p_srcElm, action->p_dstElm, &route, NULL); - unsigned int i; - for (i = 0; i < xbt_dynar_length (route); i++){ - NetworkNS3LinkPtr link = ((NetworkNS3LinkPtr)xbt_dynar_get_ptr (route, i)); - TRACE_surf_link_set_utilization (link->getName(), - action->getCategory(), - (data_delta_sent)/delta, - now-delta, - delta); - } - action->m_lastSent = data_sent; + if (TRACE_is_enabled() && + action->getState() == SURF_ACTION_RUNNING){ + double data_sent = ns3_get_socket_sent(data); + double data_delta_sent = data_sent - action->m_lastSent; + + xbt_dynar_t route = NULL; + + routing_platf->getRouteAndLatency (action->p_srcElm, action->p_dstElm, &route, NULL); + unsigned int i; + for (i = 0; i < xbt_dynar_length (route); i++){ + NetworkNS3Link* link = ((NetworkNS3Link*)xbt_dynar_get_ptr(route, i)); + TRACE_surf_link_set_utilization (link->getName(), + action->getCategory(), + (data_delta_sent)/delta, + now-delta, + delta); } - #endif + action->m_lastSent = data_sent; + } if(ns3_get_socket_is_finished(data) == 1){ xbt_dynar_push(socket_to_destroy,&key); @@ -416,7 +377,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) xbt_dynar_pop(socket_to_destroy,&key); void *data = xbt_dict_get (dict_socket, key); - action = static_cast(ns3_get_socket_action(data)); + action = static_cast(ns3_get_socket_action(data)); XBT_DEBUG ("Removing socket %p of action %p", key, action); xbt_dict_remove(dict_socket, key); } @@ -427,20 +388,21 @@ void NetworkNS3Model::updateActionsState(double now, double delta) * Resource * ************/ -NetworkNS3Link::NetworkNS3Link(NetworkNS3ModelPtr model, const char *name, xbt_dict_t props, - double bw_initial, double lat_initial) - : NetworkLink(model, name, props) - , p_lat(bprintf("%f", lat_initial)) - , p_bdw(bprintf("%f", bw_initial)) +NetworkNS3Link::NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props, + double bw_initial, double lat_initial) + : Link(model, name, props) , m_created(1) { + p_speed.scale = 1.0; + p_speed.peak = bw_initial; + m_latCurrent = lat_initial; } NetworkNS3Link::~NetworkNS3Link() { } -void NetworkNS3Link::updateState(tmgr_trace_event_t event_type, double value, double date) +void NetworkNS3Link::updateState(tmgr_trace_iterator_t event_type, double value, double date) { } @@ -449,7 +411,7 @@ void NetworkNS3Link::updateState(tmgr_trace_event_t event_type, double value, do * Action * **********/ -NetworkNS3Action::NetworkNS3Action(ModelPtr model, double cost, bool failed) +NetworkNS3Action::NetworkNS3Action(Model *model, double cost, bool failed) : NetworkAction(model, cost, failed) {} @@ -479,11 +441,14 @@ int NetworkNS3Action::unref() { m_refcount--; if (!m_refcount) { - if (actionHook::is_linked()) - p_stateSet->erase(p_stateSet->iterator_to(*this)); + if (action_hook.is_linked()) + p_stateSet->erase(p_stateSet->iterator_to(*this)); XBT_DEBUG ("Removing action %p", this); - delete this; + delete this; return 1; } return 0; } + +} +}