Make XBT_{IN,OUT,HERE} function-like macros.

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

diff --git a/src/surf/network.c b/src/surf/network.c
index 158c4b3..7a75d8b 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;
 }
@@ -198,7 +202,7 @@ static void net_parse_link_init(void)
   e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON;
   e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED;
   tmgr_trace_t state_trace;
-  DEBUG0("link_CM02");
+  XBT_DEBUG("link_CM02");
   name_link = xbt_strdup(A_surfxml_link_id);
   surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth);
   bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
@@ -343,7 +347,7 @@ static int net_action_unref(surf_action_t action)
     if (action->category)
       xbt_free(action->category);
 #endif
-    free(action);
+    surf_action_free(&action);
     return 1;
   }
   return 0;
@@ -403,6 +407,8 @@ static double net_share_resources(double now)
     }
   }
 
+  XBT_DEBUG("Min of share resources %f", min);
+
   return min;
 }
 
@@ -438,7 +444,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
@@ -502,7 +508,7 @@ static void net_update_resource_state(void *id,
                                 (nw_link->lmm_resource.power.peak *
                                  nw_link->lmm_resource.power.scale));
 #ifdef HAVE_TRACING
-    TRACE_surf_link_set_bandwidth(date, nw_link,
+    TRACE_surf_link_set_bandwidth(date, nw_link->lmm_resource.generic_resource.name,
                                   sg_bandwidth_factor *
                                   (nw_link->lmm_resource.power.peak *
                                    nw_link->lmm_resource.power.scale));
@@ -544,9 +550,9 @@ static void net_update_resource_state(void *id,
                                                       action->lat_current)));
 
         if (action->rate < sg_tcp_gamma / (2.0 * action->lat_current)) {
-          INFO0("Flow is limited BYBANDWIDTH");
+          XBT_INFO("Flow is limited BYBANDWIDTH");
         } else {
-          INFO1("Flow is limited BYLATENCY, latency of flow is %f",
+          XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f",
                 action->lat_current);
         }
       }
@@ -580,7 +586,7 @@ static void net_update_resource_state(void *id,
     if (tmgr_trace_event_free(event_type))
       nw_link->lmm_resource.state_event = NULL;
   } else {
-    CRITICAL0("Unknown event ! \n");
+    XBT_CRITICAL("Unknown event ! \n");
     xbt_abort();
   }
 
@@ -615,7 +621,7 @@ static surf_action_t net_communicate(const char *src_name,
   /* LARGE PLATFORMS HACK:
      total_route_size = route_size + src->link_nb + dst->nb */
 
-  XBT_IN4("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
+  XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
   /* LARGE PLATFORMS HACK:
      assert on total_route_size */
   latency = global_routing->get_latency(src_name,dst_name);
@@ -665,10 +671,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);
+    XBT_DEBUG("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:
@@ -714,7 +724,7 @@ static surf_action_t net_communicate(const char *src_name,
   }
 
   if (sg_network_fullduplex == 1) {
-    DEBUG1("Fullduplex active adding backward flow using 5%c", '%');
+    XBT_DEBUG("Fullduplex active adding backward flow using 5%c", '%');
     xbt_dynar_foreach(back_route, i, link) {
       lmm_expand(network_maxmin_system, link->lmm_resource.constraint,
                  action->variable, .05);
@@ -731,7 +741,7 @@ static surf_action_t net_communicate(const char *src_name,
 #endif
 
   xbt_dynar_free(&route);
-  XBT_OUT;
+  XBT_OUT();
 
   return (surf_action_t) action;
 }
@@ -788,6 +798,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);
@@ -823,7 +840,10 @@ static void surf_network_model_init_internal(void)
   surf_network_model->suspend = net_action_suspend;
   surf_network_model->resume = net_action_resume;
   surf_network_model->is_suspended = net_action_is_suspended;
-  surf_cpu_model->set_max_duration = net_action_set_max_duration;
+  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;