XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
+int NS3_EXTENSION_ID;
+
xbt_dynar_t IPV4addr;
static double time_to_next_flow_completion = -1;
{
const char* id = host->getName();
XBT_DEBUG("NS3_ADD_HOST '%s'", id);
- host->getHost()->set_facet(NS3_HOST_LEVEL, ns3_add_host(id));
+ host->getHost()->extension_set(NS3_EXTENSION_ID, ns3_add_host(id));
}
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);
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));
+ ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
free(router_id);
break;
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));
+ ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
free(router_id);
}
static void define_callbacks_ns3(void)
{
- simgrid::surf::hostCreatedCallbacks.connect(simgrid_ns3_add_host);
+ simgrid::surf::Host::onCreation.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);
routing_model_create(NULL);
define_callbacks_ns3();
- NS3_HOST_LEVEL = simgrid::Host::add_level(free_ns3_host);
+ NS3_EXTENSION_ID = simgrid::Host::extension_create(free_ns3_host);
NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, free_ns3_host);
}
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){
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);
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());
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;
}