From: schnorr <Lucas.Schnorr@imag.fr>
Date: Sat, 24 Mar 2012 21:58:20 +0000 (+0100)
Subject: [trace] simplify SD function stack
X-Git-Tag: v3_7~219
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/05db1dcff50b437219a10237de09ec792e40a840

[trace] simplify SD function stack
---

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 1dc1ca49cd..2b67678360 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -188,8 +188,6 @@ void TRACE_surf_resource_utilization_release(void);
 
 /* sd_instr.c */
 void TRACE_sd_set_task_category(SD_task_t task, const char *category);
-void TRACE_sd_task_create(SD_task_t task);
-void TRACE_sd_task_destroy(SD_task_t task);
 
 /* instr_paje.c */
 extern xbt_dict_t trivaNodeTypes;
diff --git a/src/instr/instr_simdag.c b/src/instr/instr_simdag.c
index 067b954410..668b3a7943 100644
--- a/src/instr/instr_simdag.c
+++ b/src/instr/instr_simdag.c
@@ -10,16 +10,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_simdag, instr, "Tracing SimDAG");
 
-void TRACE_sd_task_create(SD_task_t task)
-{
-  task->category = NULL;
-}
-
-void TRACE_sd_task_destroy(SD_task_t task)
-{
-  xbt_free(task->category);
-}
-
 void TRACE_sd_set_task_category(SD_task_t task, const char *category)
 {
   if (!TRACE_is_enabled())
diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c
index 9465be40f2..d1de2613f2 100644
--- a/src/simdag/sd_task.c
+++ b/src/simdag/sd_task.c
@@ -91,7 +91,7 @@ SD_task_t SD_task_create(const char *name, void *data, double amount)
   sd_global->task_number++;
 
 #ifdef HAVE_TRACING
-  TRACE_sd_task_create(task);
+  task->category = NULL;
 #endif
 
   return task;
@@ -131,7 +131,7 @@ void SD_task_destroy(SD_task_t task)
   sd_global->task_number--;
 
 #ifdef HAVE_TRACING
-  TRACE_sd_task_destroy(task);
+  if (task->category) xbt_free(task->category);
 #endif
 
   XBT_DEBUG("Task destroyed.");