X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eff13e323664f224576a26b017543955b3044b05..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 84996b1571..fd34a63232 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -8,9 +8,12 @@ #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); +int NS3_EXTENSION_ID; + xbt_dynar_t IPV4addr; static double time_to_next_flow_completion = -1; @@ -37,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); - simgrid::Host::by_name_or_create(id)->set_facet(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) @@ -55,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(simgrid::surf::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); @@ -108,8 +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); - simgrid::Host::by_name_or_create(router_id) - ->set_facet(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; @@ -120,8 +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); - simgrid::Host::by_name_or_create(router_id) - ->set_facet(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); } @@ -228,13 +231,13 @@ static void parse_ns3_end_platform(void) static void define_callbacks_ns3(void) { - simgrid::surf::hostCreatedCallbacks.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 } /********* @@ -271,7 +274,7 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() { routing_model_create(NULL); define_callbacks_ns3(); - NS3_HOST_LEVEL = simgrid::Host::add_level(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); } @@ -286,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){ @@ -297,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()); @@ -320,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; } @@ -376,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)); @@ -425,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) { }