XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
-extern xbt_lib_t host_lib;
-extern xbt_lib_t as_router_lib;
-
-extern xbt_dict_t dict_socket;
+int NS3_EXTENSION_ID;
xbt_dynar_t IPV4addr;
static double time_to_next_flow_completion = -1;
+extern xbt_dict_t dict_socket;
+
/*************
* Callbacks *
*************/
xbt_free(temp);
}
-static void simgrid_ns3_add_host(Host* host)
+static void simgrid_ns3_add_host(simgrid::Host& host)
{
- const char* id = host->getName();
+ const char* id = host.getName().c_str();
XBT_DEBUG("NS3_ADD_HOST '%s'", id);
- xbt_lib_set(host_lib,
- id,
- 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)
link->bandwidth_trace,
link->latency,
link->latency_trace,
- link->state,
+ link->initiallyOn,
link->state_trace,
link->policy,
link->properties);
}
-static void parse_ns3_add_router(sg_platf_router_cbarg_t router)
+static void simgrid_ns3_add_router(simgrid::surf::NetCard* router)
{
- XBT_DEBUG("NS3_ADD_ROUTER '%s'",router->id);
+ const char* router_id = router->getName();
+ XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
xbt_lib_set(as_router_lib,
- router->id,
+ router_id,
NS3_ASR_LEVEL,
- ns3_add_router(router->id)
+ ns3_add_router(router_id)
);
}
-static void parse_ns3_add_AS(sg_platf_AS_cbarg_t AS)
+static void parse_ns3_add_AS(simgrid::surf::As* as)
{
- XBT_DEBUG("NS3_ADD_AS '%s'",AS->id);
- xbt_lib_set(as_router_lib,
- AS->id,
- NS3_ASR_LEVEL,
- ns3_add_AS(AS->id)
- );
+ const char* as_id = as->p_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) );
}
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);
- xbt_lib_set(host_lib,
- router_id,
- NS3_HOST_LEVEL,
- ns3_add_host_cluster(router_id)
- );
+ simgrid::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;
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);
- xbt_lib_set(host_lib,
- router_id,
- NS3_HOST_LEVEL,
- ns3_add_host_cluster(router_id)
- );
+ simgrid::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);
}
router_id = bprintf("ns3_%s%d%s", cluster_prefix, elmts, cluster_suffix);
XBT_DEBUG("Create link from '%s' to '%s'",host_id,router_id);
- ns3_nodes_t host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,host_id, NS3_HOST_LEVEL));
- ns3_nodes_t host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,router_id,NS3_HOST_LEVEL));
+ ns3_nodes_t host_src = ns3_find_host(host_id);
+ ns3_nodes_t host_dst = ns3_find_host(router_id);
if(host_src && host_dst){}
else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
xbt_die("There is no routes!");
XBT_DEBUG("Have get_onelink_routes, found %ld routes",onelink_routes->used);
//save them in trace file
- Onelink *onelink;
+ 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();
- NetworkNS3Link *link = static_cast<NetworkNS3Link *>(onelink->p_link);
+ simgrid::surf::NetworkNS3Link *link =
+ static_cast<simgrid::surf::NetworkNS3Link *>(onelink->p_link);
if (strcmp(src,dst) && link->m_created){
XBT_DEBUG("Route from '%s' to '%s' with link '%s'", src, dst, link->getName());
XBT_DEBUG("\tLink (%s) bdw:%s lat:%s", link->getName(), link_bdw, link_lat);
//create link ns3
- ns3_nodes_t host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,src,NS3_HOST_LEVEL));
+ ns3_nodes_t host_src = ns3_find_host(src);
if(!host_src) host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(as_router_lib,src,NS3_ASR_LEVEL));
- ns3_nodes_t host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,dst,NS3_HOST_LEVEL));
+ ns3_nodes_t host_dst = ns3_find_host(dst);
if(!host_dst) host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(as_router_lib,dst,NS3_ASR_LEVEL));
if(host_src && host_dst){}
static void define_callbacks_ns3(void)
{
- hostCreatedCallbacks.connect(simgrid_ns3_add_host);
- sg_platf_router_add_cb (&parse_ns3_add_router);
+ simgrid::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);
- sg_platf_AS_begin_add_cb (&parse_ns3_add_AS);
+ 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
}
*********/
static void free_ns3_link(void * elmts)
{
- delete static_cast<NetworkNS3Link*>(elmts);
+ delete static_cast<simgrid::surf::NetworkNS3Link*>(elmts);
}
static void free_ns3_host(void * elmts)
if (surf_network_model)
return;
- surf_network_model = new NetworkNS3Model();
+ surf_network_model = new simgrid::surf::NetworkNS3Model();
xbt_dynar_push(all_existing_models, &surf_network_model);
}
+namespace simgrid {
+namespace surf {
+
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) {
xbt_die("Impossible to initialize NS3 interface");
routing_model_create(NULL);
define_callbacks_ns3();
- NS3_HOST_LEVEL = xbt_lib_add_level(host_lib,(void_f_pvoid_t)free_ns3_host);
- NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib,(void_f_pvoid_t)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);
}
NetworkNS3Model::~NetworkNS3Model() {
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;
}
}
return 0;
}
+
+}
+}
