[trace] links are identified by their names (the same used in the platform file)

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index eaad321..3c50adc 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -58,11 +58,18 @@ static void gap_append(double size, const link_CM02_t link, surf_action_network_
    }
 }
 
+static void gap_unknown(surf_action_network_CM02_t action) {
+   action->sender.gap = 0.0;
+   action->sender.link_name = NULL;
+   action->sender.fifo_item = NULL;
+   action->sender.size = 0.0;
+}
+
 static void gap_remove(surf_action_network_CM02_t action) {
    xbt_fifo_t fifo;
    size_t size;
 
-   if(sg_sender_gap > 0.0) {
+   if(sg_sender_gap > 0.0 && action->sender.link_name && action->sender.fifo_item) {
       fifo = (xbt_fifo_t)xbt_dict_get_or_null(gap_lookup, action->sender.link_name);
       xbt_fifo_remove_item(fifo, action->sender.fifo_item);
       size = xbt_fifo_size(fifo);
@@ -181,9 +188,6 @@ static link_CM02_t net_link_new(char *name,
 
   xbt_dict_set(surf_network_model->resource_set, name, nw_link,
                surf_resource_free);
-#ifdef HAVE_TRACING
-  TRACE_surf_link_declaration(nw_link, name, bw_initial, lat_initial);
-#endif
 
   return nw_link;
 }
@@ -438,7 +442,7 @@ static void net_update_actions_state(double now, double delta)
     link_CM02_t link;
     unsigned int i;
     xbt_dynar_foreach(route, i, link) {
-      TRACE_surf_link_set_utilization(link,
+      TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name,
                                       action->generic_action.data,
                                       (surf_action_t) action,
                                       lmm_variable_getvalue
@@ -665,10 +669,14 @@ static surf_action_t net_communicate(const char *src_name,
       (*bandwidth_constraint_callback) (action->rate, bandwidth_bound,
                                         size);
 
-  link = *(link_CM02_t*)xbt_dynar_get_ptr(route, 0);
-  gap_append(size, link, action);
-  DEBUG5("Comm %p: %s -> %s gap=%f (lat=%f)",
-         action, src_name, dst_name, action->sender.gap, action->latency);
+  if(xbt_dynar_length(route) > 0) {
+    link = *(link_CM02_t*)xbt_dynar_get_ptr(route, 0);
+    gap_append(size, link, action);
+    DEBUG5("Comm %p: %s -> %s gap=%f (lat=%f)",
+           action, src_name, dst_name, action->sender.gap, action->latency);
+  } else {
+    gap_unknown(action);
+  }
 
 
   /* LARGE PLATFORMS HACK:
@@ -788,6 +796,13 @@ void net_action_set_max_duration(surf_action_t action, double duration)
   action->max_duration = duration;
 }
 
+#ifdef HAVE_TRACING
+static void net_action_set_category(surf_action_t action, const char *category)
+{
+  action->category = xbt_strdup (category);
+}
+#endif
+
 static void net_finalize(void)
 {
   surf_model_exit(surf_network_model);
@@ -824,6 +839,9 @@ static void surf_network_model_init_internal(void)
   surf_network_model->resume = net_action_resume;
   surf_network_model->is_suspended = net_action_is_suspended;
   surf_network_model->set_max_duration = net_action_set_max_duration;
+#ifdef HAVE_TRACING
+  surf_network_model->set_category = net_action_set_category;
+#endif
 
   surf_network_model->extension.network.communicate = net_communicate;
   surf_network_model->extension.network.get_route = net_get_route;