* 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/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);
);
}
-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->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) );
}
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)
{
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<Link*> *route = new std::vector<Link*>();
+
+ 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;
}