X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2782917c11aa6d946e6f21189d6e653114b9295..9735863c1ccb1ae8b55853262d6e1c3ee3a8698f:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 2143f2c986..f86ef2c182 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -5,10 +5,13 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/surf/network_ns3.hpp" + +#include "src/surf/HostImpl.hpp" #include "src/surf/surf_private.h" -#include "src/surf/host_interface.hpp" #include "simgrid/sg_config.h" -#include "src/surf/platform.hpp" +#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals + +#include "simgrid/s4u/As.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3); @@ -34,22 +37,18 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link) { XBT_DEBUG("NS3_ADD_LINK '%s'",link->id); - if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),free); + if(!IPV4addr) + IPV4addr = xbt_dynar_new(sizeof(char*),free); surf_network_model->createLink(link->id, - link->bandwidth, - link->bandwidth_trace, - link->latency, - link->latency_trace, - link->initiallyOn, - link->state_trace, - link->policy, - link->properties); + link->bandwidth, link->bandwidth_trace, + link->latency, link->latency_trace, + link->state_trace, link->policy, link->properties); } static void simgrid_ns3_add_router(simgrid::surf::NetCard* router) { - const char* router_id = router->getName(); + const char* router_id = router->name(); XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id); xbt_lib_set(as_router_lib, router_id, @@ -58,13 +57,14 @@ static void simgrid_ns3_add_router(simgrid::surf::NetCard* router) ); } -static void parse_ns3_add_AS(simgrid::surf::As* as) +static void parse_ns3_add_AS(simgrid::s4u::As* as) { - const char* as_id = as->p_name; + const char* as_id = as->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) ); } +#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) { const char *groups = NULL; @@ -165,10 +165,10 @@ static void create_ns3_topology(void) 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(); + char *src = onelink->src_->name(); + char *dst = onelink->dst_->name(); simgrid::surf::NetworkNS3Link *link = - static_cast(onelink->p_link); + static_cast(onelink->link_); if (strcmp(src,dst) && link->m_created){ XBT_DEBUG("Route from '%s' to '%s' with link '%s'", src, dst, link->getName()); @@ -259,14 +259,11 @@ NetworkNS3Model::~NetworkNS3Model() { } 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){ + double bw_initial, tmgr_trace_t bw_trace, + double lat_initial, tmgr_trace_t lat_trace, + 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) @@ -278,20 +275,13 @@ Link* NetworkNS3Model::createLink(const char *name, return link; } -xbt_dynar_t NetworkNS3Model::getRoute(NetCard *src, NetCard *dst) -{ - xbt_dynar_t route = NULL; - routing_platf->getRouteAndLatency(src, dst, &route, NULL); - return route; -} - Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, double size, double rate) { - XBT_DEBUG("Communicate from %s to %s", src->getName(), dst->getName()); + XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name()); NetworkNS3Action *action = new NetworkNS3Action(this, size, 0); - ns3_create_flow(src->getName(), dst->getName(), surf_get_clock(), size, action); + ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, action); action->m_lastSent = 0; action->p_srcElm = src; @@ -301,9 +291,9 @@ Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, return (surf_action_t) action; } -double NetworkNS3Model::shareResources(double now) +double NetworkNS3Model::next_occuring_event(double now) { - XBT_DEBUG("ns3_share_resources"); + XBT_DEBUG("ns3_next_occuring_event"); //get the first relevant value from the running_actions list if (!getRunningActionSet()->size() || now == 0.0) @@ -350,18 +340,13 @@ void NetworkNS3Model::updateActionsState(double now, double delta) 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); - } + std::vector *route = new std::vector(); + + routing_platf->getRouteAndLatency (action->p_srcElm, action->p_dstElm, route, NULL); + for (auto link : *route) + TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta); + delete route; + action->m_lastSent = data_sent; } @@ -401,7 +386,7 @@ NetworkNS3Link::~NetworkNS3Link() { } -void NetworkNS3Link::updateState(tmgr_trace_iterator_t event_type, double value) +void NetworkNS3Link::apply_event(tmgr_trace_iterator_t event, double value) { THROW_UNIMPLEMENTED; } @@ -414,13 +399,7 @@ NetworkNS3Action::NetworkNS3Action(Model *model, double cost, bool failed) : NetworkAction(model, cost, failed) {} -#ifdef HAVE_LATENCY_BOUND_TRACKING - int NetworkNS3Action::getLatencyLimited() { - return m_latencyLimited; - } -#endif - - void NetworkNS3Action::suspend() +void NetworkNS3Action::suspend() { THROW_UNIMPLEMENTED; }