X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f86e6af017daa4b31f72b5644b52e8962eee4b35..653a39ca9cbfe9bed2b9a13859772c5fb576d8da:/src/surf/network_vivaldi.c?ds=sidebyside

diff --git a/src/surf/network_vivaldi.c b/src/surf/network_vivaldi.c
index 8be7582331..c25b58239c 100644
--- 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,
-                                 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);
 
-  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;
 
@@ -217,6 +214,12 @@ static void netviva_parse_host(void) {
   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);
@@ -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;
+#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;
@@ -263,9 +269,9 @@ void surf_network_model_init_Vivaldi(const char *filename)
                            "Vivaldi", surf_network_model);
 
 #ifdef HAVE_TRACING
-  __TRACE_host_variable(0,"vivaldi_x",0,"declare");
-  __TRACE_host_variable(0,"vivaldi_y",0,"declare");
-  __TRACE_host_variable(0,"vivaldi_h",0,"declare");
+  TRACE_user_host_variable(0,"vivaldi_x",0,"declare");
+  TRACE_user_host_variable(0,"vivaldi_y",0,"declare");
+  TRACE_user_host_variable(0,"vivaldi_h",0,"declare");
 #endif
 
   xbt_cfg_set_string(_surf_cfg_set, "routing", "none");