[trace] cosmetics, remove TRACE_is_active, use TRACE_is_enabled instead

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

diff --git a/src/instr/instr_smx.c b/src/instr/instr_smx.c
index 45ed73e..4bc2df0 100644 (file)
--- a/src/instr/instr_smx.c
+++ b/src/instr/instr_smx.c
@@ -8,46 +8,24 @@
 
 #ifdef HAVE_TRACING
 
-static long long int counter = 0;       /* to uniquely identify simix actions */
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_simix, instr, "Tracing Simix");
 
 void TRACE_smx_host_execute(smx_action_t act)
 {
-  char *category = NULL;
-  if (!IS_TRACING)
-    return;
-
-  act->counter = counter++;
-  category = TRACE_category_get(SIMIX_process_self());
-  if (category) {
-    act->category = xbt_new(char, strlen(category) + 1);
-    strncpy(act->category, category, strlen(category) + 1);
-  }
-  TRACE_surf_resource_utilization_start(act);
+  if (!TRACE_is_enabled()) return;
+  return;
 }
 
 void TRACE_smx_action_communicate(smx_action_t act, smx_process_t proc)
 {
-  char *category = NULL;
-  if (!IS_TRACING)
-    return;
-
-  act->counter = counter++;
-  category = TRACE_category_get(proc);
-  if (category) {
-    act->category = xbt_strdup(category);
-  }
-  TRACE_surf_resource_utilization_start(act);
+  if (!TRACE_is_enabled()) return;
+  return;
 }
 
 void TRACE_smx_action_destroy(smx_action_t act)
 {
-  if (!IS_TRACING)
-    return;
-
-  if (act->category) {
-    xbt_free(act->category);
-  }
-  TRACE_surf_resource_utilization_end(act);
+  if (!TRACE_is_enabled()) return;
+  return;
 }
 
 #endif /* HAVE_TRACING */