A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
give a default value at field declaration, not everywhere in subclasses
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
2ef3c94
..
5e38359
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-11,14
+11,13
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
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;
xbt_dynar_t IPV4addr;
static double time_to_next_flow_completion = -1;
+extern xbt_dict_t dict_socket;
+
/*************
* Callbacks *
*************/
/*************
* Callbacks *
*************/
@@
-40,15
+39,11
@@
static void replace_lat_ns3(char ** lat)
xbt_free(temp);
}
xbt_free(temp);
}
-static void simgrid_ns3_add_host(Host* host)
+static void simgrid_ns3_add_host(
simgrid::surf::
Host* host)
{
const char* id = host->getName();
XBT_DEBUG("NS3_ADD_HOST '%s'", id);
{
const char* id = host->getName();
XBT_DEBUG("NS3_ADD_HOST '%s'", id);
- xbt_lib_set(host_lib,
- id,
- 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)
}
static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
@@
-68,7
+63,7
@@
static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
link->properties);
}
link->properties);
}
-static void simgrid_ns3_add_router(RoutingEdge* router)
+static void simgrid_ns3_add_router(
simgrid::surf::
RoutingEdge* router)
{
const char* router_id = router->getName();
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
{
const char* router_id = router->getName();
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
@@
-79,14
+74,11
@@
static void simgrid_ns3_add_router(RoutingEdge* router)
);
}
);
}
-static void parse_ns3_add_AS(s
g_platf_AS_cbarg_t AS
)
+static void parse_ns3_add_AS(s
imgrid::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)
}
static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
@@
-118,11
+110,8
@@
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);
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;
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
free(router_id);
break;
@@
-133,11
+122,8
@@
static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
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);
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);
}
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
free(router_id);
}
@@
-162,8
+148,8
@@
static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
router_id = bprintf("ns3_%s%d%s", cluster_prefix, elmts, cluster_suffix);
XBT_DEBUG("Create link from '%s' to '%s'",host_id,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);
if(host_src && host_dst){}
else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
@@
-201,12
+187,13
@@
static void create_ns3_topology(void)
xbt_die("There is no routes!");
XBT_DEBUG("Have get_onelink_routes, found %ld routes",onelink_routes->used);
//save them in trace file
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();
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());
if (strcmp(src,dst) && link->m_created){
XBT_DEBUG("Route from '%s' to '%s' with link '%s'", src, dst, link->getName());
@@
-220,9
+207,9
@@
static void create_ns3_topology(void)
XBT_DEBUG("\tLink (%s) bdw:%s lat:%s", link->getName(), link_bdw, link_lat);
//create link ns3
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));
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){}
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){}
@@
-243,11
+230,11
@@
static void parse_ns3_end_platform(void)
static void define_callbacks_ns3(void)
{
static void define_callbacks_ns3(void)
{
-
hostCreatedCallbacks
.connect(simgrid_ns3_add_host);
- routingEdgeCreatedCallbacks.connect(simgrid_ns3_add_router);
+
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);
sg_platf_link_add_cb (&parse_ns3_add_link);
sg_platf_cluster_add_cb (&parse_ns3_add_cluster);
- s
g_platf_AS_begin_add_cb (&
parse_ns3_add_AS);
+ s
imgrid::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
}
sg_platf_postparse_add_cb(&create_ns3_topology); //get_one_link_routes
sg_platf_postparse_add_cb(&parse_ns3_end_platform); //InitializeRoutes
}
@@
-257,7
+244,7
@@
static void define_callbacks_ns3(void)
*********/
static void free_ns3_link(void * elmts)
{
*********/
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)
}
static void free_ns3_host(void * elmts)
@@
-271,11
+258,14
@@
void surf_network_model_init_NS3()
if (surf_network_model)
return;
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);
}
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");
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) {
xbt_die("Impossible to initialize NS3 interface");
@@
-283,8
+273,8
@@
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
routing_model_create(NULL);
define_callbacks_ns3();
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() {
}
NetworkNS3Model::~NetworkNS3Model() {
@@
-309,7
+299,7
@@
Link* NetworkNS3Model::createLink(const char *name,
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);
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;
}
return link;
}
@@
-332,7
+322,7
@@
Action *NetworkNS3Model::communicate(RoutingEdge *src, RoutingEdge *dst,
action->m_lastSent = 0;
action->p_srcElm = src;
action->p_dstElm = dst;
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 (surf_action_t) action;
}
@@
-484,3
+474,6
@@
int NetworkNS3Action::unref()
}
return 0;
}
}
return 0;
}
+
+}
+}