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

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8386 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/instr/private.h b/src/instr/private.h
index 97bb8c9..974f68c 100644 (file)
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -97,7 +97,7 @@ void TRACE_smx_action_execute (smx_action_t act);
 void TRACE_smx_action_communicate (smx_action_t act, smx_process_t proc);
 void TRACE_smx_action_destroy (smx_action_t act);
 
-/* from surf.c */
+/* from surf_instr.c */
 void TRACE_surf_alloc (void);
 void TRACE_surf_release (void);
 void TRACE_surf_host_declaration (char *name, double power);
@@ -142,8 +142,8 @@ char *TRACE_get_platform_method (void);
 void TRACE_global_init(int *argc, char **argv);
 
 /* from resource_utilization.c */
-void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
-void TRACE_surf_link_set_utilization (void *link, 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);
+void TRACE_surf_link_set_utilization (void *link, smx_action_t smx_action, surf_action_t surf_action, double value, double now, double delta);
 void TRACE_surf_resource_utilization_start (smx_action_t action);
 void TRACE_surf_resource_utilization_event (smx_action_t action, double now, double delta, const char *variable, const char *resource, double value);
 void TRACE_surf_resource_utilization_end (smx_action_t action);

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;
 }

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index e36b315..4dcc8ad 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -199,7 +199,7 @@ static void cpu_update_actions_state(double now, double delta)
     cpu_Cas01_t x = lmm_constraint_id(lmm_get_cnst_from_var (cpu_maxmin_system, action->variable, 0));
 
     TRACE_surf_host_set_utilization (x->generic_resource.name,
-              action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta);
+              action->generic_action.data, (surf_action_t)action, lmm_variable_getvalue(action->variable), now-delta, delta);
 #endif
     double_update(&(action->generic_action.remains),
                   lmm_variable_getvalue(action->variable) * delta);

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index d5196dc..4950f77 100644 (file)
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -229,7 +229,7 @@ static void cpu_im_update_remains(cpu_Cas01_im_t cpu, double now)
                                                                 cpu->last_update));
 #ifdef HAVE_TRACING
       TRACE_surf_host_set_utilization (cpu->generic_resource.name,
-                action->generic_lmm_action.generic_action.data, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), cpu->last_update, now-cpu->last_update);
+                action->generic_lmm_action.generic_action.data, (surf_action_t)action, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), cpu->last_update, now-cpu->last_update);
 #endif
       DEBUG2("Update action(%p) remains %lf", action,
              GENERIC_ACTION(action).remains);
@@ -311,7 +311,7 @@ static void cpu_im_update_actions_state(double now, double delta)
     /* set the remains to 0 due to precision problems when updating the remaining amount */
 #ifdef HAVE_TRACING
     TRACE_surf_host_set_utilization (((cpu_Cas01_im_t)(action->cpu))->generic_resource.name,
-              action->generic_lmm_action.generic_action.data, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), ((cpu_Cas01_im_t)(action->cpu))->last_update, now-((cpu_Cas01_im_t)(action->cpu))->last_update);
+              action->generic_lmm_action.generic_action.data, (surf_action_t)action, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), ((cpu_Cas01_im_t)(action->cpu))->last_update, now-((cpu_Cas01_im_t)(action->cpu))->last_update);
 #endif
     GENERIC_ACTION(action).remains = 0;
     cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);

diff --git a/src/surf/network.c b/src/surf/network.c
index 49046b6..c933aae 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -352,7 +352,7 @@ static void net_update_actions_state(double now, double delta)
     unsigned int i;
     xbt_dynar_foreach(route, i, link) {
       TRACE_surf_link_set_utilization (link,
-          action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta);
+          action->generic_action.data, (surf_action_t)action, lmm_variable_getvalue(action->variable), now-delta, delta);
     }
 #endif
     double_update(&(action->generic_action.remains),