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
[routing] rename routing_global_t -> routing_platf_t (and friends)
[simgrid.git]
/
src
/
surf
/
network_gtnets.c
diff --git
a/src/surf/network_gtnets.c
b/src/surf/network_gtnets.c
index
99590b7
..
7193b0d
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,8
+333,8
@@
static void update_resource_state(void *id,
}
/* Max durations are not supported */
}
/* Max durations are not supported */
-static surf_action_t communicate(
network_element
_t src_card,
-
network_element
_t dst_card,
+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;
double size, double rate)
{
surf_action_network_GTNETS_t action = NULL;