get trace category from surf_action instead of smx_action when tracing categorized...

[simgrid.git] / src / instr / resource_utilization.c

diff --git a/src/instr/resource_utilization.c b/src/instr/resource_utilization.c
index be326be..b41c6b0 100644 (file)
--- a/src/instr/resource_utilization.c
+++ b/src/instr/resource_utilization.c
@@ -327,7 +327,7 @@ static void __TRACE_C_end (smx_action_t action)
 /*
  * TRACE_surf_link_set_utilization: entry point from SimGrid
  */
-void TRACE_surf_link_set_utilization (void *link, smx_action_t smx_action, double value, double now, double delta)
+void TRACE_surf_link_set_utilization (void *link, smx_action_t smx_action, surf_action_t surf_action, double value, double now, double delta)
 {
   if (!IS_TRACING) return;
   if (!value) return;
@@ -341,9 +341,9 @@ void TRACE_surf_link_set_utilization (void *link, smx_action_t smx_action, doubl
   TRACE_surf_resource_utilization_event (smx_action, now, delta, "bandwidth_used", resource, value);
 
   //trace categorized utilization
-  if (!IS_TRACED(smx_action)) return;
+  if (!IS_TRACED(surf_action)) return;
   char type[100];
-  snprintf (type, 100, "b%s", smx_action->category);
+  snprintf (type, 100, "b%s", surf_action->category);
   TRACE_surf_resource_utilization_event (smx_action, now, delta, type, resource, value);
   return;
 }
@@ -351,7 +351,7 @@ void TRACE_surf_link_set_utilization (void *link, smx_action_t smx_action, doubl
 /*
  * TRACE_surf_host_set_utilization: entry point from SimGrid
  */
-void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta)
+void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, surf_action_t surf_action, double value, double now, double delta)
 {
   if (!IS_TRACING) return;
   if (!value) return;
@@ -360,9 +360,9 @@ void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action,
   TRACE_surf_resource_utilization_event (smx_action, now, delta, "power_used", name, value);
 
   //trace categorized utilization
-  if (!IS_TRACED(smx_action)) return;
+  if (!IS_TRACED(surf_action)) return;
   char type[100];
-  snprintf (type, 100, "p%s", smx_action->category);
+  snprintf (type, 100, "p%s", surf_action->category);
   TRACE_surf_resource_utilization_event (smx_action, now, delta, type, name, value);
   return;
 }