X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/62b54dd272b6f669c0a9b231991d572c3bec52b5..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 56361f7d8c..fd34a63232 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -8,17 +8,17 @@ #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); -extern xbt_lib_t host_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 * *************/ @@ -40,15 +40,11 @@ static void replace_lat_ns3(char ** lat) xbt_free(temp); } -static void simgrid_ns3_add_host(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); - xbt_lib_set(host_lib, - id, - NS3_HOST_LEVEL, - 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) @@ -62,13 +58,13 @@ 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); } -static void simgrid_ns3_add_router(RoutingEdge* router) +static void simgrid_ns3_add_router(simgrid::surf::NetCard* router) { const char* router_id = router->getName(); XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id); @@ -79,7 +75,7 @@ static void simgrid_ns3_add_router(RoutingEdge* router) ); } -static void parse_ns3_add_AS(As* as) +static void parse_ns3_add_AS(simgrid::surf::As* as) { const char* as_id = as->p_name; XBT_DEBUG("NS3_ADD_AS '%s'", as_id); @@ -115,11 +111,8 @@ 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); - xbt_lib_set(host_lib, - router_id, - NS3_HOST_LEVEL, - ns3_add_host_cluster(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); break; @@ -130,11 +123,8 @@ 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); - xbt_lib_set(host_lib, - router_id, - NS3_HOST_LEVEL, - ns3_add_host_cluster(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); } @@ -159,8 +149,8 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) 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); @@ -198,12 +188,13 @@ 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 - Onelink *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(); - NetworkNS3Link *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()); @@ -217,9 +208,9 @@ static void create_ns3_topology(void) 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)); + 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 = static_cast(xbt_lib_get_or_null(host_lib,dst,NS3_HOST_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){} @@ -240,15 +231,13 @@ static void parse_ns3_end_platform(void) static void define_callbacks_ns3(void) { - 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); - - 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::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 } /********* @@ -256,7 +245,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) @@ -270,11 +259,14 @@ 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(all_existing_models, &surf_network_model); } +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"); @@ -282,8 +274,8 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() { 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_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() { @@ -297,7 +289,7 @@ Link* NetworkNS3Model::createLink(const char *name, tmgr_trace_t bw_trace, double lat_initial, tmgr_trace_t lat_trace, - e_surf_resource_state_t state_initial, + int initiallyOn, tmgr_trace_t state_trace, e_surf_link_sharing_policy_t policy, xbt_dict_t properties){ @@ -308,19 +300,18 @@ Link* NetworkNS3Model::createLink(const char *name, if (state_trace) XBT_INFO("The NS3 network model doesn't support link state traces"); Link* link = new NetworkNS3Link(this, name, properties, bw_initial, lat_initial); - surf_callback_emit(networkLinkCreatedCallbacks, link); + Link::onCreation(link); return link; } -xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdge *src, RoutingEdge *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; } -Action *NetworkNS3Model::communicate(RoutingEdge *src, RoutingEdge *dst, +Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, double size, double rate) { XBT_DEBUG("Communicate from %s to %s", src->getName(), dst->getName()); @@ -331,7 +322,7 @@ Action *NetworkNS3Model::communicate(RoutingEdge *src, RoutingEdge *dst, action->m_lastSent = 0; action->p_srcElm = src; action->p_dstElm = dst; - surf_callback_emit(networkCommunicateCallbacks, action, src, dst, size, rate); + networkCommunicateCallbacks(action, src, dst, size, rate); return (surf_action_t) action; } @@ -387,7 +378,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) xbt_dynar_t route = NULL; - routing_get_route_and_latency (action->p_srcElm, action->p_dstElm, &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)); @@ -436,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) { } @@ -483,3 +474,6 @@ int NetworkNS3Action::unref() } return 0; } + +} +}