X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1c91d656133ea5c62b304f955705d7275ed5030f..ae7bffe6655b934fc4a09ca1a34e10de5d8dd366:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 2550a71c15..56361f7d8c 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -1,18 +1,17 @@ -/* 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" -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; @@ -41,13 +40,14 @@ static void replace_lat_ns3(char ** lat) xbt_free(temp); } -static void parse_ns3_add_host(sg_platf_host_cbarg_t host) +static void simgrid_ns3_add_host(Host* host) { - XBT_DEBUG("NS3_ADD_HOST '%s'",host->id); + const char* id = host->getName(); + XBT_DEBUG("NS3_ADD_HOST '%s'", id); xbt_lib_set(host_lib, - host->id, + id, NS3_HOST_LEVEL, - ns3_add_host(host->id) + ns3_add_host(id) ); } @@ -57,7 +57,7 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link) if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),free); - LinkPtr net_link = surf_network_model->createLink(link->id, + surf_network_model->createLink(link->id, link->bandwidth, link->bandwidth_trace, link->latency, @@ -66,28 +66,24 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link) 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(RoutingEdge* 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(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) @@ -202,12 +198,12 @@ 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; + 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); + 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()); @@ -244,11 +240,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); + hostCreatedCallbacks.connect(simgrid_ns3_add_host); + routingEdgeCreatedCallbacks.connect(simgrid_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); + + 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 } @@ -258,7 +256,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) @@ -274,10 +272,10 @@ void surf_network_model_init_NS3() surf_network_model = new NetworkNS3Model(); - xbt_dynar_push(model_list, &surf_network_model); + xbt_dynar_push(all_existing_models, &surf_network_model); } -NetworkNS3Model::NetworkNS3Model() : NetworkModel("network NS3") { +NetworkNS3Model::NetworkNS3Model() : NetworkModel() { if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) { xbt_die("Impossible to initialize NS3 interface"); } @@ -294,7 +292,7 @@ NetworkNS3Model::~NetworkNS3Model() { xbt_dict_free(&dict_socket); } -LinkPtr NetworkNS3Model::createLink(const char *name, +Link* NetworkNS3Model::createLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -309,10 +307,12 @@ LinkPtr NetworkNS3Model::createLink(const char *name, 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); + surf_callback_emit(networkLinkCreatedCallbacks, link); + return link; } -xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdgePtr src, RoutingEdgePtr dst) +xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdge *src, RoutingEdge *dst) { xbt_dynar_t route = NULL; routing_get_route_and_latency(src, dst, &route, NULL); @@ -320,11 +320,11 @@ xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdgePtr src, RoutingEdgePtr dst) return route; } -ActionPtr NetworkNS3Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, +Action *NetworkNS3Model::communicate(RoutingEdge *src, RoutingEdge *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); @@ -374,9 +374,9 @@ 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)); @@ -390,7 +390,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) 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)); + NetworkNS3Link* link = ((NetworkNS3Link*)xbt_dynar_get_ptr(route, i)); TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, @@ -412,7 +412,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); } @@ -423,7 +423,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) * Resource * ************/ -NetworkNS3Link::NetworkNS3Link(NetworkNS3ModelPtr model, const char *name, xbt_dict_t props, +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)) @@ -445,7 +445,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) {} @@ -475,7 +475,7 @@ int NetworkNS3Action::unref() { m_refcount--; if (!m_refcount) { - if (actionHook::is_linked()) + if (action_hook.is_linked()) p_stateSet->erase(p_stateSet->iterator_to(*this)); XBT_DEBUG ("Removing action %p", this); delete this;