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
SMPI's network model calibration script: you give it information about your platform...
[simgrid.git]
/
src
/
surf
/
network_vivaldi.c
diff --git
a/src/surf/network_vivaldi.c
b/src/surf/network_vivaldi.c
index
8be7582
..
1631827
100644
(file)
--- a/
src/surf/network_vivaldi.c
+++ b/
src/surf/network_vivaldi.c
@@
-126,17
+126,14
@@
static void netviva_update_resource_state(void *id,
}
static surf_action_t netviva_communicate(const char *src_name, const char *dst_name,
}
static surf_action_t netviva_communicate(const char *src_name, const char *dst_name,
-
int src, int dst,
double size, double rate)
+ double size, double rate)
{
{
+ surf_action_network_Vivaldi_t action = NULL;
netviva_coords_t c1,c2;
c1 = xbt_dict_get(coords,src_name);
c2 = xbt_dict_get(coords,dst_name);
netviva_coords_t c1,c2;
c1 = xbt_dict_get(coords,src_name);
c2 = xbt_dict_get(coords,dst_name);
- surf_action_network_Vivaldi_t action = NULL;
-
- action =
- surf_action_new(sizeof(s_surf_action_network_Vivaldi_t), size,
- surf_network_model, 0);
+ action = surf_action_new(sizeof(s_surf_action_network_Vivaldi_t), size,surf_network_model, 0);
action->suspended = 0;
action->suspended = 0;
@@
-217,6
+214,12
@@
static void netviva_parse_host(void) {
xbt_dict_set(coords, A_surfxml_host_id,coord,NULL);
}
xbt_dict_set(coords, A_surfxml_host_id,coord,NULL);
}
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+static int netviva_get_latency_limited(surf_action_t action){
+ return 0;
+}
+#endif
+
void surf_network_model_init_Vivaldi(const char *filename)
{
xbt_assert(surf_network_model == NULL);
void surf_network_model_init_Vivaldi(const char *filename)
{
xbt_assert(surf_network_model == NULL);
@@
-231,6
+234,9
@@
void surf_network_model_init_Vivaldi(const char *filename)
surf_network_model->action_cancel = netviva_action_cancel;
surf_network_model->action_recycle = netviva_action_recycle;
surf_network_model->get_remains = netviva_action_get_remains;
surf_network_model->action_cancel = netviva_action_cancel;
surf_network_model->action_recycle = netviva_action_recycle;
surf_network_model->get_remains = netviva_action_get_remains;
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+ surf_network_model->get_latency_limited = netviva_get_latency_limited;
+#endif
surf_network_model->model_private->resource_used = netviva_resource_used;
surf_network_model->model_private->share_resources = netviva_share_resources;
surf_network_model->model_private->resource_used = netviva_resource_used;
surf_network_model->model_private->share_resources = netviva_share_resources;