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
model-checker : fix dot output for smpi examples
[simgrid.git]
/
src
/
surf
/
network_ns3.c
diff --git
a/src/surf/network_ns3.c
b/src/surf/network_ns3.c
index 9248945253530d0f0e2961425c3c5c96e62fa9c4..e180da04f34b565b2a4b64fee05adb8149d4ea1c 100644
(file)
--- a/
src/surf/network_ns3.c
+++ b/
src/surf/network_ns3.c
@@
-109,13
+109,13
@@
static void parse_ns3_add_router(sg_platf_router_cbarg_t router)
);
}
);
}
-static void parse_ns3_add_AS(
const char*id, const char*routing
)
+static void parse_ns3_add_AS(
sg_platf_AS_cbarg_t AS
)
{
{
- XBT_DEBUG("NS3_ADD_AS '%s'",id);
+ XBT_DEBUG("NS3_ADD_AS '%s'",
AS->
id);
xbt_lib_set(as_router_lib,
xbt_lib_set(as_router_lib,
- id,
+
AS->
id,
NS3_ASR_LEVEL,
NS3_ASR_LEVEL,
- ns3_add_AS(id)
+ ns3_add_AS(
AS->
id)
);
}
);
}
@@
-215,7
+215,7
@@
static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
replace_bdw_ns3(&bw);
ns3_add_cluster(bw,lat,cluster->id);
xbt_free(lat);
replace_bdw_ns3(&bw);
ns3_add_cluster(bw,lat,cluster->id);
xbt_free(lat);
- xbt_free(bw);
+ xbt_free(bw);
}
static double ns3_get_link_latency (const void *link)
}
static double ns3_get_link_latency (const void *link)
@@
-272,7
+272,7
@@
static void create_ns3_topology(void)
replace_bdw_ns3(&link_bdw);
((surf_ns3_link_t)link)->created = 0;
replace_bdw_ns3(&link_bdw);
((surf_ns3_link_t)link)->created = 0;
- //
XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id);
+ // XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id);
XBT_DEBUG("\tLink (%s) bdw:%s lat:%s",((surf_ns3_link_t)link)->data->id,
link_bdw,
link_lat
XBT_DEBUG("\tLink (%s) bdw:%s lat:%s",((surf_ns3_link_t)link)->data->id,
link_bdw,
link_lat
@@
-317,8
+317,8
@@
static void free_ns3_link(void * elmts)
static void free_ns3_host(void * elmts)
{
static void free_ns3_host(void * elmts)
{
-
ns3_nodes_t host = elmts;
-
free(host);
+ ns3_nodes_t host = elmts;
+ free(host);
}
#ifdef HAVE_LATENCY_BOUND_TRACKING
}
#ifdef HAVE_LATENCY_BOUND_TRACKING
@@
-362,7
+362,7
@@
void surf_network_model_init_NS3()
/* Added the initialization for NS3 interface */
/* Added the initialization for NS3 interface */
- if (ns3_initialize(xbt_cfg_get_string(_s
urf_cfg_set,
"ns3/TcpModel"))) {
+ if (ns3_initialize(xbt_cfg_get_string(_s
g_cfg_set,
"ns3/TcpModel"))) {
xbt_die("Impossible to initialize NS3 interface");
}
xbt_die("Impossible to initialize NS3 interface");
}