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 : remove unused argument in functions for heap comparison algorithm
[simgrid.git]
/
src
/
surf
/
network_gtnets.c
diff --git
a/src/surf/network_gtnets.c
b/src/surf/network_gtnets.c
index
7cedacf
..
27eb0cb
100644
(file)
--- a/
src/surf/network_gtnets.c
+++ b/
src/surf/network_gtnets.c
@@
-14,7
+14,7
@@
static double time_to_next_flow_completion = -1;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf,
"Logging specific to the SURF network GTNetS module");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf,
"Logging specific to the SURF network GTNetS module");
-extern routing_
global_t global_routing
;
+extern routing_
platf_t routing_platf
;
double sg_gtnets_jitter = 0.0;
int sg_gtnets_jitter_seed = 10;
double sg_gtnets_jitter = 0.0;
int sg_gtnets_jitter_seed = 10;
@@
-113,7
+113,7
@@
static void create_gtnets_topology(void)
// and then you can use the id to reimplement properly the following GTNets calls
//get the onelinks from the parsed platform
// and then you can use the id to reimplement properly the following GTNets calls
//get the onelinks from the parsed platform
- xbt_dynar_t onelink_routes =
global_routing
->get_onelink_routes();
+ xbt_dynar_t onelink_routes =
routing_platf
->get_onelink_routes();
if (!onelink_routes)
return;
if (!onelink_routes)
return;
@@
-333,16
+333,16
@@
static void update_resource_state(void *id,
}
/* Max durations are not supported */
}
/* Max durations are not supported */
-static surf_action_t communicate(
void *
src_card,
-
void *dst_card, double size
,
- double rate)
+static surf_action_t communicate(
sg_routing_edge_t
src_card,
+
sg_routing_edge_t dst_card
,
+ double
size, double
rate)
{
surf_action_network_GTNETS_t action = NULL;
{
surf_action_network_GTNETS_t action = NULL;
- int src =
((network_element_t)src_card)
->id;
- int dst =
((network_element_t)dst_card)
->id;
- char *src_name =
((network_element_t)src_card)
->name;
- char *dst_name =
((network_element_t)dst_card)
->name;
+ int src =
src_card
->id;
+ int dst =
dst_card
->id;
+ char *src_name =
src_card
->name;
+ char *dst_name =
dst_card
->name;
xbt_assert((src >= 0
&& dst >= 0), "Either src or dst have invalid id (id<0)");
xbt_assert((src >= 0
&& dst >= 0), "Either src or dst have invalid id (id<0)");
@@
-438,7
+438,7
@@
static void surf_network_model_init_internal(void)
xbt_die("Impossible to initialize GTNetS interface");
}
xbt_die("Impossible to initialize GTNetS interface");
}
- routing_model_create(
sizeof(network_link_GTNETS_t),
NULL);
+ routing_model_create(NULL);
}
#ifdef HAVE_LATENCY_BOUND_TRACKING
}
#ifdef HAVE_LATENCY_BOUND_TRACKING