X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/01ea0133fc146d94852753a7f07d874de0b9815c..65e338fbfd769d49b29242bfe56cde18c03b6074:/src/instr/smx_instr.c diff --git a/src/instr/smx_instr.c b/src/instr/smx_instr.c index 848eb6fb4b..229b15bf68 100644 --- a/src/instr/smx_instr.c +++ b/src/instr/smx_instr.c @@ -12,25 +12,29 @@ static long long int counter = 0; /* to uniquely identify simix actions */ void TRACE_smx_action_execute (smx_action_t act) { + char *category = NULL; if (!IS_TRACING) return; act->counter = counter++; - char *category = __TRACE_current_category_get (SIMIX_process_self()); + category = __TRACE_category_get (SIMIX_process_self()); if (category){ - act->category = xbt_new (char, strlen (category)+1); - strncpy (act->category, category, strlen(category)+1); + act->category = xbt_new (char, strlen (category)+1); + strncpy (act->category, category, strlen(category)+1); } + __TRACE_surf_resource_utilization_start (act); } void TRACE_smx_action_communicate (smx_action_t act, smx_process_t proc) { + char *category = NULL; if (!IS_TRACING) return; act->counter = counter++; - char *category = __TRACE_current_category_get (proc); + category = __TRACE_category_get (proc); if (category){ act->category = xbt_strdup (category); } + __TRACE_surf_resource_utilization_start (act); } void TRACE_smx_action_destroy (smx_action_t act) @@ -40,6 +44,7 @@ void TRACE_smx_action_destroy (smx_action_t act) if (act->category){ xbt_free (act->category); } + __TRACE_surf_resource_utilization_end (act); } #endif