X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec4e2d87d99b8ad76c9096033eb858e9052b09fa..16bbb8a8212497d9c44c81333ed2c0e689e0c5af:/src/surf/network_ns3.cpp?ds=sidebyside diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 163de0c20b..9063b50303 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -8,6 +8,7 @@ #include "src/surf/surf_private.h" #include "src/surf/host_interface.hpp" #include "simgrid/sg_config.h" +#include "src/surf/platform.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3); @@ -39,11 +40,11 @@ static void replace_lat_ns3(char ** lat) xbt_free(temp); } -static void simgrid_ns3_add_host(simgrid::surf::Host* host) +static void simgrid_ns3_add_host(simgrid::s4u::Host& host) { - const char* id = host->getName(); + const char* id = host.name().c_str(); XBT_DEBUG("NS3_ADD_HOST '%s'", id); - host->getHost()->extension_set(NS3_EXTENSION_ID, ns3_add_host(id)); + host.extension_set(NS3_EXTENSION_ID, ns3_add_host(id)); } static void parse_ns3_add_link(sg_platf_link_cbarg_t link) @@ -57,7 +58,7 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link) link->bandwidth_trace, link->latency, link->latency_trace, - link->state, + link->initiallyOn, link->state_trace, link->policy, link->properties); @@ -110,7 +111,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) 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); - simgrid::Host::by_name_or_create(router_id) + 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); @@ -122,7 +123,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) 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); - simgrid::Host::by_name_or_create(router_id) + 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); @@ -230,13 +231,13 @@ static void parse_ns3_end_platform(void) static void define_callbacks_ns3(void) { - simgrid::surf::Host::onCreation.connect(simgrid_ns3_add_host); - simgrid::surf::routingEdgeCreatedCallbacks.connect(simgrid_ns3_add_router); - sg_platf_link_add_cb (&parse_ns3_add_link); - sg_platf_cluster_add_cb (&parse_ns3_add_cluster); + 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); - sg_platf_postparse_add_cb(&create_ns3_topology); //get_one_link_routes - sg_platf_postparse_add_cb(&parse_ns3_end_platform); //InitializeRoutes + simgrid::surf::on_postparse.connect(&create_ns3_topology); //get_one_link_routes + simgrid::surf::on_postparse.connect(&parse_ns3_end_platform); //InitializeRoutes } /********* @@ -273,7 +274,7 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() { routing_model_create(NULL); define_callbacks_ns3(); - NS3_EXTENSION_ID = simgrid::Host::extension_create(free_ns3_host); + NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(free_ns3_host); NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, free_ns3_host); } @@ -284,14 +285,14 @@ NetworkNS3Model::~NetworkNS3Model() { } Link* NetworkNS3Model::createLink(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){ + 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) @@ -306,13 +307,12 @@ Link* NetworkNS3Model::createLink(const char *name, 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; } Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, - double size, double rate) + double size, double rate) { XBT_DEBUG("Communicate from %s to %s", src->getName(), dst->getName()); NetworkNS3Action *action = new NetworkNS3Action(this, size, 0); @@ -372,23 +372,23 @@ void NetworkNS3Model::updateActionsState(double now, double delta) action->setRemains(action->getCost() - ns3_get_socket_sent(data)); 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++){ - 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); - } - action->m_lastSent = data_sent; + 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); + } + action->m_lastSent = data_sent; } if(ns3_get_socket_is_finished(data) == 1){ @@ -415,7 +415,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) ************/ NetworkNS3Link::NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props, - double bw_initial, double lat_initial) + double bw_initial, double lat_initial) : Link(model, name, props) , p_lat(bprintf("%f", lat_initial)) , p_bdw(bprintf("%f", bw_initial)) @@ -427,7 +427,7 @@ 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) { } @@ -466,10 +466,10 @@ int NetworkNS3Action::unref() { m_refcount--; if (!m_refcount) { - if (action_hook.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;