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
40fbd0b
..
5e38359
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-11,6
+11,8
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
+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;
@@
-41,7
+43,7
@@
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);
-
simgrid::Host::get_host(id)->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)
}
static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
@@
-108,8
+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);
- simgrid::Host::
get_host
(router_id)
- ->
set_facet(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;
@@
-120,8
+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);
- simgrid::Host::
get_host
(router_id)
- ->
set_facet(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);
}
@@
-228,7
+230,7
@@
static void parse_ns3_end_platform(void)
static void define_callbacks_ns3(void)
{
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);
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);
@@
-271,7
+273,7
@@
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
routing_model_create(NULL);
define_callbacks_ns3();
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);
}
NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, free_ns3_host);
}
@@
-297,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;
}
@@
-320,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;
}