#include "simgrid/s4u/engine.hpp"
#include "simgrid/s4u/host.hpp"
+
#include "src/kernel/routing/NetZoneImpl.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
}
}
-static void instr_routing_parse_start_link(simgrid::surf::Link* link)
+static void instr_routing_parse_start_link(simgrid::surf::LinkImpl* link)
{
if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback?
return;
double bandwidth_value = link->bandwidth();
double latency_value = link->latency();
- container_t container = PJ_container_new(link->getName(), INSTR_LINK, father);
+ container_t container = PJ_container_new(link->cname(), INSTR_LINK, father);
if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_link())) {
type_t bandwidth = PJ_type_get_or_null("bandwidth", container->type);
}
-void sg_instr_new_router(const char* name, const char* coords)
+void sg_instr_new_router(const char* name)
{
- container_t father = currentContainer.back();
- PJ_container_new(name, INSTR_ROUTER, father);
+ if (TRACE_is_enabled() && TRACE_needs_platform()) {
+ container_t father = currentContainer.back();
+ PJ_container_new(name, INSTR_ROUTER, father);
+ }
}
static void instr_routing_parse_end_platform ()
//always need the call backs to ASes (we need only the root AS),
//to create the rootContainer and the rootType properly
if (!TRACE_needs_platform()) return;
- simgrid::surf::Link::onCreation.connect(instr_routing_parse_start_link);
- simgrid::surf::on_postparse.connect(instr_routing_parse_end_platform);
+ simgrid::surf::LinkImpl::onCreation.connect(instr_routing_parse_start_link);
+ simgrid::s4u::onPlatformCreated.connect(instr_routing_parse_end_platform);
}
/*