From: schnorr <schnorr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 6 Oct 2010 14:48:10 +0000 (+0000)
Subject: cosmetics on tracing mechanism
X-Git-Tag: v3_5~463
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/653a39ca9cbfe9bed2b9a13859772c5fb576d8da?hp=be9df0b83ffac70c7adcd066b34882d81de75a19

cosmetics on tracing mechanism

details:
- no export of functions starting with __ or _
- functions ending with _alloc and _release are used to initialize tracing modules

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

diff --git a/include/instr/instr.h b/include/instr/instr.h
index 0e30ddb9d7..770c1ffaf9 100644
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -32,53 +32,53 @@ XBT_PUBLIC(int) TRACE_create_category (const char *category, const char *type, c
 XBT_PUBLIC(void) TRACE_msg_set_task_category (m_task_t task, const char *category);
 XBT_PUBLIC(void) TRACE_msg_set_process_category (m_process_t process, const char *category);
 XBT_PUBLIC(void) TRACE_set_mask (int mask);
-XBT_PUBLIC(void) __TRACE_host_variable (double time, const char *variable, double value, const char *what);
-XBT_PUBLIC(void) __TRACE_link_variable (double time, const char *src, const char *dst, const char *variable, double value, const char *what);
+XBT_PUBLIC(void) TRACE_user_host_variable (double time, const char *variable, double value, const char *what);
+XBT_PUBLIC(void) TRACE_user_link_variable (double time, const char *src, const char *dst, const char *variable, double value, const char *what);
 XBT_PUBLIC(void) TRACE_declare_mark (const char *mark_type);
 XBT_PUBLIC(void) TRACE_mark (const char *mark_type, const char *mark_value);
 XBT_PUBLIC(int) TRACE_smpi_set_category (const char *category);
 
 #define TRACE_host_variable_declare(var) \
-	__TRACE_host_variable(0,var,0,"declare");
+	TRACE_user_host_variable(0,var,0,"declare");
 
 #define TRACE_host_variable_set_with_time(time,var,value) \
-	__TRACE_host_variable(time,var,value,"set");
+	TRACE_user_host_variable(time,var,value,"set");
 
 #define TRACE_host_variable_add_with_time(time,var,value) \
-	__TRACE_host_variable(time,var,value,"add");
+	TRACE_user_host_variable(time,var,value,"add");
 
 #define TRACE_host_variable_sub_with_time(time,var,value) \
-	__TRACE_host_variable(time,var,value,"sub");
+	TRACE_user_host_variable(time,var,value,"sub");
 
 #define TRACE_host_variable_set(var,value) \
-	__TRACE_host_variable(MSG_get_clock(),var,value,"set");
+	TRACE_user_host_variable(MSG_get_clock(),var,value,"set");
 
 #define TRACE_host_variable_add(var,value) \
-	__TRACE_host_variable(MSG_get_clock(),var,value,"add");
+	TRACE_user_host_variable(MSG_get_clock(),var,value,"add");
 
 #define TRACE_host_variable_sub(var,value) \
-	__TRACE_host_variable(MSG_get_clock(),var,value,"sub");
+	TRACE_user_host_variable(MSG_get_clock(),var,value,"sub");
 
 #define TRACE_link_variable_declare(var) \
-	__TRACE_link_variable(0,NULL,NULL,var,0,"declare");
+	TRACE_user_link_variable(0,NULL,NULL,var,0,"declare");
 
 #define TRACE_link_variable_set_with_time(time,src,dst,var,value) \
-	__TRACE_link_variable(time,src,dst,var,value,"set");
+	TRACE_user_link_variable(time,src,dst,var,value,"set");
 
 #define TRACE_link_variable_add_with_time(time,src,dst,var,value) \
-	__TRACE_link_variable(time,src,dst,var,value,"add");
+	TRACE_user_link_variable(time,src,dst,var,value,"add");
 
 #define TRACE_link_variable_sub_with_time(time,src,dst,var,value) \
-	__TRACE_link_variable(time,src,dst,var,value,"sub");
+	TRACE_user_link_variable(time,src,dst,var,value,"sub");
 
 #define TRACE_link_variable_set(src,dst,var,value) \
-	__TRACE_link_variable(MSG_get_clock(),src,dst,var,value,"set");
+	TRACE_user_link_variable(MSG_get_clock(),src,dst,var,value,"set");
 
 #define TRACE_link_variable_add(src,dst,var,value) \
-	__TRACE_link_variable(MSG_get_clock(),src,dst,var,value,"add");
+	TRACE_user_link_variable(MSG_get_clock(),src,dst,var,value,"add");
 
 #define TRACE_link_variable_sub(src,dst,var,value) \
-	__TRACE_link_variable(MSG_get_clock(),src,dst,var,value,"sub");
+	TRACE_user_link_variable(MSG_get_clock(),src,dst,var,value,"sub");
 
 #else /* HAVE_TRACING */
 
diff --git a/src/instr/categories.c b/src/instr/categories.c
index 7487f74392..e34f83e388 100644
--- a/src/instr/categories.c
+++ b/src/instr/categories.c
@@ -10,12 +10,17 @@
 
 static xbt_dict_t current_task_category = NULL;
 
-void __TRACE_category_init ()
+void TRACE_category_alloc ()
 {
   current_task_category = xbt_dict_new();
 }
 
-void __TRACE_category_set (smx_process_t proc, const char *category)
+void TRACE_category_release ()
+{
+  xbt_dict_free (&current_task_category);
+}
+
+void TRACE_category_set (smx_process_t proc, const char *category)
 {
   char processid[100];
   char *var_cpy = NULL;
@@ -24,14 +29,14 @@ void __TRACE_category_set (smx_process_t proc, const char *category)
   xbt_dict_set (current_task_category, processid, var_cpy, xbt_free);
 }
 
-char *__TRACE_category_get (smx_process_t proc)
+char *TRACE_category_get (smx_process_t proc)
 {
   char processid[100];
   snprintf (processid, 100, "%p", proc);
   return xbt_dict_get_or_null (current_task_category, processid);
 }
 
-void __TRACE_category_unset (smx_process_t proc)
+void TRACE_category_unset (smx_process_t proc)
 {
   char processid[100];
   snprintf (processid, 100, "%p", proc);
@@ -40,9 +45,9 @@ void __TRACE_category_unset (smx_process_t proc)
   }
 }
 
-void __TRACE_msg_category_set (smx_process_t proc, m_task_t task)
+void TRACE_msg_category_set (smx_process_t proc, m_task_t task)
 {
-  __TRACE_category_set (proc, task->category);
+  TRACE_category_set (proc, task->category);
 }
 
 
diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index dc6576023e..a7dadebaef 100644
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -19,42 +19,42 @@
 
 static int trace_configured = 0;
 
-int _TRACE_configured (void)
+int TRACE_is_configured (void)
 {
   return trace_configured;
 }
 
-int _TRACE_smpi_enabled (void)
+int TRACE_smpi_is_enabled (void)
 {
   return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI);
 }
 
-int _TRACE_platform_enabled (void)
+int TRACE_platform_is_enabled (void)
 {
   return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_PLATFORM);
 }
 
-int _TRACE_msg_task_enabled (void)
+int TRACE_msg_task_is_enabled (void)
 {
   return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK);
 }
 
-int _TRACE_msg_process_enabled (void)
+int TRACE_msg_process_is_enabled (void)
 {
   return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS);
 }
 
-int _TRACE_msg_volume_enabled (void)
+int TRACE_msg_volume_is_enabled (void)
 {
   return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME);
 }
 
-char *_TRACE_filename (void)
+char *TRACE_get_filename (void)
 {
   return xbt_cfg_get_string (_surf_cfg_set, OPT_TRACING_FILENAME);
 }
 
-char *_TRACE_platform_method (void)
+char *TRACE_get_platform_method (void)
 {
   return xbt_cfg_get_string (_surf_cfg_set, OPT_TRACING_PLATFORM_METHOD);
 }
diff --git a/src/instr/interface.c b/src/instr/interface.c
index 3f998aaf4c..c4887130d0 100644
--- a/src/instr/interface.c
+++ b/src/instr/interface.c
@@ -17,7 +17,7 @@ static xbt_dict_t created_categories;
 
 int TRACE_start ()
 {
-  if (!_TRACE_configured()){
+  if (!TRACE_is_configured()){
     THROW0 (tracing_error, TRACE_ERROR_START,
             "TRACE_start should be called after SimGrid initialization functions.");
     return 0;
@@ -29,7 +29,7 @@ int TRACE_start ()
     return 0;
   }
 
-  char *filename = _TRACE_filename ();
+  char *filename = TRACE_get_filename ();
   if (!filename){
     THROW0 (tracing_error, TRACE_ERROR_START,
             "Trace filename is not initialized.");
@@ -90,11 +90,11 @@ int TRACE_start ()
   /* other trace initialization */
   defined_types = xbt_dict_new();
   created_categories = xbt_dict_new();
-  __TRACE_msg_init();
-  __TRACE_category_init ();
-  TRACE_surf_init();
-  __TRACE_msg_process_init ();
-  __TRACE_smpi_init ();
+  TRACE_msg_task_alloc ();
+  TRACE_category_alloc ();
+  TRACE_surf_alloc ();
+  TRACE_msg_process_alloc ();
+  TRACE_smpi_alloc ();
 
   return 0;
 }
@@ -204,10 +204,10 @@ int TRACE_smpi_set_category (const char *category)
   if (!IS_TRACING) return 1;
   if (category != NULL){
     int ret = TRACE_category (category);
-    __TRACE_category_set (SIMIX_process_self(), category);
+    TRACE_category_set (SIMIX_process_self(), category);
     return ret;
   }else{
-    __TRACE_category_unset (SIMIX_process_self());
+    TRACE_category_unset (SIMIX_process_self());
     return 0;
   }
 }
diff --git a/src/instr/msg_process_instr.c b/src/instr/msg_process_instr.c
index 38564b5fe6..44afeafa4e 100644
--- a/src/instr/msg_process_instr.c
+++ b/src/instr/msg_process_instr.c
@@ -10,12 +10,17 @@
 
 static xbt_dict_t process_containers = NULL;
 
-void __TRACE_msg_process_init (void)
+void TRACE_msg_process_alloc (void)
 {
   process_containers = xbt_dict_new();
 }
 
-void __TRACE_msg_process_location (m_process_t process)
+void TRACE_msg_process_release (void)
+{
+  xbt_dict_free (&process_containers);
+}
+
+static void TRACE_msg_process_location (m_process_t process)
 {
 	char name[200], alias[200];
 	m_host_t host = NULL;
@@ -33,7 +38,7 @@ void __TRACE_msg_process_location (m_process_t process)
   }
 }
 
-void __TRACE_msg_process_present (m_process_t process)
+static void TRACE_msg_process_present (m_process_t process)
 {
 	char alias[200];
 	m_host_t host = NULL;
@@ -57,8 +62,8 @@ void TRACE_msg_set_process_category (m_process_t process, const char *category)
   process->category = xbt_strdup(category);
 
   //create container of type "PROCESS" to indicate location
-  __TRACE_msg_process_location (process);
-  __TRACE_msg_process_present (process);
+  TRACE_msg_process_location (process);
+  TRACE_msg_process_present (process);
 
   //create container of type "process" to indicate behavior
   TRACE_process_container (process, name, 200);
@@ -78,8 +83,8 @@ void TRACE_msg_process_change_host (m_process_t process, m_host_t old_host, m_ho
   TRACE_process_alias_container (process, old_host, alias, 200);
   if (IS_TRACING_PROCESSES) pajePopState (MSG_get_clock(), "presence", alias);
 
-  __TRACE_msg_process_location (process);
-  __TRACE_msg_process_present (process);
+  TRACE_msg_process_location (process);
+  TRACE_msg_process_present (process);
 }
 
 void TRACE_msg_process_kill (m_process_t process)
diff --git a/src/instr/msg_task_instr.c b/src/instr/msg_task_instr.c
index 5e868c3300..ad1f3d2909 100644
--- a/src/instr/msg_task_instr.c
+++ b/src/instr/msg_task_instr.c
@@ -10,12 +10,17 @@
 
 static xbt_dict_t task_containers = NULL;
 
-void __TRACE_msg_init (void)
+void TRACE_msg_task_alloc (void)
 {
   task_containers = xbt_dict_new();
 }
 
-void __TRACE_task_location (m_task_t task)
+void TRACE_msg_task_release (void)
+{
+  xbt_dict_free (&task_containers);
+}
+
+static void TRACE_task_location (m_task_t task)
 {
 	char container[200];
 	char name[200], alias[200];
@@ -39,7 +44,7 @@ void __TRACE_task_location (m_task_t task)
   }
 }
 
-void __TRACE_task_location_present (m_task_t task)
+static void TRACE_task_location_present (m_task_t task)
 {
 	char alias[200];
 	m_process_t process = NULL;
@@ -53,7 +58,7 @@ void __TRACE_task_location_present (m_task_t task)
   pajePushState (MSG_get_clock(), "presence", alias, "presence");
 }
 
-void __TRACE_task_location_not_present (m_task_t task)
+static void TRACE_task_location_not_present (m_task_t task)
 {
 	char alias[200];
 	m_process_t process = NULL;
@@ -80,8 +85,8 @@ void TRACE_msg_set_task_category(m_task_t task, const char *category)
   strncpy(task->category, category, strlen(category)+1);
 
   //tracing task location based on host
-  __TRACE_task_location (task);
-  __TRACE_task_location_present (task);
+  TRACE_task_location (task);
+  TRACE_task_location_present (task);
 
   TRACE_task_container (task, name, 200);
   //create container of type "task" to indicate behavior
@@ -106,7 +111,7 @@ void TRACE_msg_task_execute_start (m_task_t task)
   TRACE_task_container (task, name, 200);
   if (IS_TRACING_TASKS) pajePushState (MSG_get_clock(), "task-state", name, "execute");
 
-  __TRACE_msg_category_set (SIMIX_process_self(), task);
+  TRACE_msg_category_set (SIMIX_process_self(), task);
 }
 
 void TRACE_msg_task_execute_end (m_task_t task)
@@ -117,7 +122,7 @@ void TRACE_msg_task_execute_end (m_task_t task)
   TRACE_task_container (task, name, 200);
   if (IS_TRACING_TASKS) pajePopState (MSG_get_clock(), "task-state", name);
 
-  __TRACE_category_unset(SIMIX_process_self());
+  TRACE_category_unset(SIMIX_process_self());
 }
 
 /* MSG_task_destroy related functions */
@@ -130,7 +135,7 @@ void TRACE_msg_task_destroy (m_task_t task)
   if (IS_TRACING_TASKS) pajeDestroyContainer (MSG_get_clock(), "task", name);
 
   //finish the location of this task
-  __TRACE_task_location_not_present (task);
+  TRACE_task_location_not_present (task);
 
   //free category
   xbt_free (task->category);
@@ -151,10 +156,10 @@ void TRACE_msg_task_get_end (double start_time, m_task_t task)
   TRACE_task_container (task, name, 200);
   if (IS_TRACING_TASKS) pajePopState (MSG_get_clock(), "task-state", name);
 
-  __TRACE_msg_volume_finish (task);
+  TRACE_msg_volume_finish (task);
 
-  __TRACE_task_location (task);
-  __TRACE_task_location_present (task);
+  TRACE_task_location (task);
+  TRACE_task_location_present (task);
 }
 
 /* MSG_task_put related functions */
@@ -167,13 +172,13 @@ int TRACE_msg_task_put_start (m_task_t task)
   if (IS_TRACING_TASKS) pajePopState (MSG_get_clock(), "task-state", name);
   if (IS_TRACING_TASKS) pajePushState (MSG_get_clock(), "task-state", name, "communicate");
 
-  __TRACE_msg_volume_start (task);
+  TRACE_msg_volume_start (task);
 
   //trace task location grouped by host
-  __TRACE_task_location_not_present (task);
+  TRACE_task_location_not_present (task);
 
   //set current category
-  __TRACE_msg_category_set (SIMIX_process_self(), task);
+  TRACE_msg_category_set (SIMIX_process_self(), task);
   return 1;
 }
 
@@ -181,7 +186,7 @@ void TRACE_msg_task_put_end (void)
 {
   if (!IS_TRACING) return;
 
-  __TRACE_category_unset (SIMIX_process_self());
+  TRACE_category_unset (SIMIX_process_self());
 }
 
 #endif
diff --git a/src/instr/msg_volume.c b/src/instr/msg_volume.c
index da38f743a1..8544449355 100644
--- a/src/instr/msg_volume.c
+++ b/src/instr/msg_volume.c
@@ -8,7 +8,7 @@
 
 #ifdef HAVE_TRACING
 
-void __TRACE_msg_volume_start (m_task_t task)
+void TRACE_msg_volume_start (m_task_t task)
 {
 	m_process_t process = NULL;
 	m_host_t host = NULL;
@@ -34,7 +34,7 @@ void __TRACE_msg_volume_start (m_task_t task)
   pajeStartLinkWithVolume (MSG_get_clock(), "volume", "0", task->category, process_alias, task_name, volume);
 }
 
-void __TRACE_msg_volume_finish (m_task_t task)
+void TRACE_msg_volume_finish (m_task_t task)
 {
 	char process_name[200], process_alias[200];
 	char task_name[200];
diff --git a/src/instr/private.h b/src/instr/private.h
index c754646dea..af9692d735 100644
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -15,11 +15,11 @@ extern int tracing_active; /* declared in paje.c */
 
 #define IS_TRACING			  (tracing_active)
 #define IS_TRACED(n)          (n->category)
-#define IS_TRACING_TASKS      (_TRACE_msg_task_enabled())
-#define IS_TRACING_PLATFORM   (_TRACE_platform_enabled())
-#define IS_TRACING_PROCESSES  (_TRACE_msg_process_enabled())
-#define IS_TRACING_VOLUME     (_TRACE_msg_volume_enabled())
-#define IS_TRACING_SMPI       (_TRACE_smpi_enabled())
+#define IS_TRACING_TASKS      (TRACE_msg_task_is_enabled())
+#define IS_TRACING_PLATFORM   (TRACE_platform_is_enabled())
+#define IS_TRACING_PROCESSES  (TRACE_msg_process_is_enabled())
+#define IS_TRACING_VOLUME     (TRACE_msg_volume_is_enabled())
+#define IS_TRACING_SMPI       (TRACE_smpi_is_enabled())
 
 #include "instr/instr.h"
 #include "msg/msg.h"
@@ -58,17 +58,16 @@ char *TRACE_process_alias_container (m_process_t process, m_host_t host, char *o
 char *TRACE_task_alias_container (m_task_t task, m_process_t process, m_host_t host, char *output, int len);
 
 /* from categories.c */
-void __TRACE_category_init (void);
-void __TRACE_category_set (smx_process_t proc, const char *category);
-char *__TRACE_category_get (smx_process_t proc);
-void __TRACE_category_unset (smx_process_t proc);
-void __TRACE_msg_category_set (smx_process_t proc, m_task_t task);
+void TRACE_category_alloc (void);
+void TRACE_category_release (void);
+void TRACE_category_set (smx_process_t proc, const char *category);
+char *TRACE_category_get (smx_process_t proc);
+void TRACE_category_unset (smx_process_t proc);
+void TRACE_msg_category_set (smx_process_t proc, m_task_t task);
 
 /* declaration of instrumentation functions from msg_task_instr.c */
-void __TRACE_msg_init (void);
-void __TRACE_task_location (m_task_t task);
-void __TRACE_task_location_present (m_task_t task);
-void __TRACE_task_location_not_present (m_task_t task);
+void TRACE_msg_task_alloc (void);
+void TRACE_msg_task_release (void);
 void TRACE_msg_task_create (m_task_t task);
 void TRACE_msg_task_execute_start (m_task_t task);
 void TRACE_msg_task_execute_end (m_task_t task);
@@ -79,9 +78,8 @@ int TRACE_msg_task_put_start (m_task_t task); //returns TRUE if the task_put_end
 void TRACE_msg_task_put_end (void);
 
 /* declaration of instrumentation functions from msg_process_instr.c */
-void __TRACE_msg_process_init (void);
-void __TRACE_msg_process_location (m_process_t process);
-void __TRACE_msg_process_present (m_process_t process);
+void TRACE_msg_process_alloc (void);
+void TRACE_msg_process_release (void);
 void TRACE_msg_process_change_host (m_process_t process, m_host_t old_host, m_host_t new_host);
 void TRACE_msg_process_kill (m_process_t process);
 void TRACE_msg_process_suspend (m_process_t process);
@@ -91,8 +89,8 @@ void TRACE_msg_process_sleep_out (m_process_t process);
 void TRACE_msg_process_end (m_process_t process);
 
 /* declaration of instrumentation functions from msg_volume.c */
-void __TRACE_msg_volume_start (m_task_t task);
-void __TRACE_msg_volume_finish (m_task_t task);
+void TRACE_msg_volume_start (m_task_t task);
+void TRACE_msg_volume_finish (m_task_t task);
 
 /* from smx.c */
 void TRACE_smx_action_execute (smx_action_t act);
@@ -100,8 +98,8 @@ 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 */
-void TRACE_surf_init (void);
-void TRACE_surf_finalize (void);
+void TRACE_surf_alloc (void);
+void TRACE_surf_release (void);
 void TRACE_surf_host_declaration (char *name, double power);
 void TRACE_surf_host_set_power (double date, char *resource, double power);
 void TRACE_surf_host_define_id (const char *name, int host_id);
@@ -119,11 +117,11 @@ int TRACE_surf_gtnets_get_dst (void *action);
 void TRACE_surf_gtnets_destroy (void *action);
 
 /* from smpi_instr.c */
-void __TRACE_smpi_init (void);
+void TRACE_smpi_alloc (void);
+void TRACE_smpi_release (void);
 void TRACE_smpi_init (int rank);
 void TRACE_smpi_finalize (int rank);
 void TRACE_smpi_start (void);
-void TRACE_smpi_end (void);
 void TRACE_smpi_collective_in (int rank, int root, const char *operation);
 void TRACE_smpi_collective_out (int rank, int root, const char *operation);
 void TRACE_smpi_ptp_in (int rank, int src, int dst, const char *operation);
@@ -132,24 +130,24 @@ void TRACE_smpi_send (int rank, int src, int dst);
 void TRACE_smpi_recv (int rank, int src, int dst);
 
 /* from instr_config.c */
-int _TRACE_configured (void);
-int _TRACE_smpi_enabled (void);
-int _TRACE_platform_enabled (void);
-int _TRACE_msg_task_enabled (void);
-int _TRACE_msg_process_enabled (void);
-int _TRACE_msg_volume_enabled (void);
-char *_TRACE_filename (void);
-char *_TRACE_platform_method (void);
+int TRACE_is_configured (void);
+int TRACE_smpi_is_enabled (void);
+int TRACE_platform_is_enabled (void);
+int TRACE_msg_task_is_enabled (void);
+int TRACE_msg_process_is_enabled (void);
+int TRACE_msg_volume_is_enabled (void);
+char *TRACE_get_filename (void);
+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_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);
-void __TRACE_surf_resource_utilization_initialize (void);
-void __TRACE_surf_resource_utilization_finalize (void);
+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);
+void TRACE_surf_resource_utilization_alloc (void);
+void TRACE_surf_resource_utilization_release (void);
 
 #endif
 
diff --git a/src/instr/resource_utilization.c b/src/instr/resource_utilization.c
index 506f41e035..7382fd6c89 100644
--- a/src/instr/resource_utilization.c
+++ b/src/instr/resource_utilization.c
@@ -90,6 +90,7 @@ static void __TRACE_surf_check_variable_set_to_zero (double now, const char *var
   /* end of check */
 }
 
+#define A_METHOD
 //A
 static void __TRACE_surf_resource_utilization_A (double now, double delta, const char *variable, const char *resource, double value)
 {
@@ -104,6 +105,7 @@ static void __TRACE_surf_resource_utilization_A (double now, double delta, const
   return;
 }
 
+#define B_METHOD
 //B
 static void __TRACE_surf_resource_utilization_initialize_B ()
 {
@@ -242,6 +244,7 @@ static void __TRACE_surf_resource_utilization_finalize_B ()
   xbt_dict_free (&method_b_dict);
 }
 
+#define C_METHOD
 //C
 static void __TRACE_surf_resource_utilization_start_C (smx_action_t action)
 {
@@ -323,6 +326,7 @@ static void __TRACE_surf_resource_utilization_finalize_C ()
   xbt_dict_free (&method_c_dict);
 }
 
+#define RESOURCE_UTILIZATION_INTERFACE
 /*
  * TRACE_surf_link_set_utilization: entry point from SimGrid
  */
@@ -339,7 +343,7 @@ void TRACE_surf_link_set_utilization (void *link, smx_action_t smx_action, doubl
   char resource[100];
   snprintf (resource, 100, "%p", link);
   snprintf (type, 100, "b%s", smx_action->category);
-  __TRACE_surf_resource_utilization_event (smx_action, now, delta, type, resource, value);
+  TRACE_surf_resource_utilization_event (smx_action, now, delta, type, resource, value);
   return;
 }
 
@@ -354,28 +358,21 @@ void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action,
   if (!value) return;
 
   snprintf (type, 100, "p%s", smx_action->category);
-  __TRACE_surf_resource_utilization_event (smx_action, now, delta, type, name, value);
+  TRACE_surf_resource_utilization_event (smx_action, now, delta, type, name, value);
   return;
 }
 
 /*
  * __TRACE_surf_resource_utilization_*: entry points from tracing functions
  */
-void __TRACE_surf_resource_utilization_start (smx_action_t action)
+void TRACE_surf_resource_utilization_start (smx_action_t action)
 {
   if (currentMethod == methodC){
     __TRACE_surf_resource_utilization_start_C (action);
   }
 }
 
-void __TRACE_surf_resource_utilization_end (smx_action_t action)
-{
-  if (currentMethod == methodC){
-    __TRACE_surf_resource_utilization_end_C (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_event (smx_action_t action, double now, double delta, const char *variable, const char *resource, double value)
 {
   if (currentMethod == methodA){
     __TRACE_surf_resource_utilization_A (now, delta, variable, resource, value);
@@ -386,11 +383,18 @@ void __TRACE_surf_resource_utilization_event (smx_action_t action, double now, d
   }
 }
 
-void __TRACE_surf_resource_utilization_initialize ()
+void TRACE_surf_resource_utilization_end (smx_action_t action)
+{
+  if (currentMethod == methodC){
+    __TRACE_surf_resource_utilization_end_C (action);
+  }
+}
+
+void TRACE_surf_resource_utilization_alloc ()
 {
   platform_variables = xbt_dict_new();
 
-  __TRACE_define_method (_TRACE_platform_method());
+  __TRACE_define_method (TRACE_get_platform_method());
 
   if (currentMethod == methodA){
   }else if (currentMethod == methodB){
@@ -400,7 +404,7 @@ void __TRACE_surf_resource_utilization_initialize ()
   }
 }
 
-void __TRACE_surf_resource_utilization_finalize ()
+void TRACE_surf_resource_utilization_release ()
 {
   if (currentMethod == methodA){
   }else if (currentMethod == methodB){
diff --git a/src/instr/smpi_instr.c b/src/instr/smpi_instr.c
index e36927acc5..aa65cd644d 100644
--- a/src/instr/smpi_instr.c
+++ b/src/instr/smpi_instr.c
@@ -10,13 +10,13 @@
 
 static xbt_dict_t keys;
 
-static char *_TRACE_smpi_container (int rank, char *container, int n)
+static char *TRACE_smpi_container (int rank, char *container, int n)
 {
   snprintf (container, n, "rank-%d", rank);
   return container;
 }
 
-static char *_TRACE_smpi_put_key (int src, int dst, char *key, int n)
+static char *TRACE_smpi_put_key (int src, int dst, char *key, int n)
 {
   //get the dynar for src#dst
   char aux[100];
@@ -34,7 +34,7 @@ static char *_TRACE_smpi_put_key (int src, int dst, char *key, int n)
   return key;
 }
 
-static char *_TRACE_smpi_get_key (int src, int dst, char *key, int n)
+static char *TRACE_smpi_get_key (int src, int dst, char *key, int n)
 {
   char aux[100];
   snprintf (aux, 100, "%d#%d", src, dst);
@@ -47,7 +47,7 @@ static char *_TRACE_smpi_get_key (int src, int dst, char *key, int n)
   return key;
 }
 
-void __TRACE_smpi_init ()
+void TRACE_smpi_alloc ()
 {
   keys = xbt_dict_new();
 }
@@ -59,9 +59,9 @@ void TRACE_smpi_start (void)
   }
 }
 
-void TRACE_smpi_end (void)
+void TRACE_smpi_release (void)
 {
-  TRACE_surf_finalize ();
+  TRACE_surf_release ();
   if (IS_TRACING_SMPI){
     TRACE_end();
   }
@@ -72,7 +72,7 @@ void TRACE_smpi_init (int rank)
   if (!IS_TRACING_SMPI) return;
 
   char str[100];
-  _TRACE_smpi_container (rank, str, 100);
+  TRACE_smpi_container (rank, str, 100);
   pajeCreateContainer (SIMIX_get_clock(), str, "MPI_PROCESS",
       SIMIX_host_get_name(SIMIX_host_self()), str);
 }
@@ -83,7 +83,7 @@ void TRACE_smpi_finalize (int rank)
 
   char str[100];
   pajeDestroyContainer (SIMIX_get_clock(), "MPI_PROCESS",
-      _TRACE_smpi_container (rank, str, 100));
+      TRACE_smpi_container (rank, str, 100));
 }
 
 void TRACE_smpi_collective_in (int rank, int root, const char *operation)
@@ -92,7 +92,7 @@ void TRACE_smpi_collective_in (int rank, int root, const char *operation)
 
   char str[100];
   pajePushState (SIMIX_get_clock(), "MPI_STATE",
-      _TRACE_smpi_container (rank, str, 100), operation);
+      TRACE_smpi_container (rank, str, 100), operation);
 }
 
 void TRACE_smpi_collective_out (int rank, int root, const char *operation)
@@ -101,7 +101,7 @@ void TRACE_smpi_collective_out (int rank, int root, const char *operation)
 
   char str[100];
   pajePopState (SIMIX_get_clock(), "MPI_STATE",
-      _TRACE_smpi_container (rank, str, 100));
+      TRACE_smpi_container (rank, str, 100));
 }
 
 void TRACE_smpi_ptp_in (int rank, int src, int dst, const char *operation)
@@ -110,7 +110,7 @@ void TRACE_smpi_ptp_in (int rank, int src, int dst, const char *operation)
 
   char str[100];
   pajePushState (SIMIX_get_clock(), "MPI_STATE",
-      _TRACE_smpi_container (rank, str, 100), operation);
+      TRACE_smpi_container (rank, str, 100), operation);
 }
 
 void TRACE_smpi_ptp_out (int rank, int src, int dst, const char *operation)
@@ -119,7 +119,7 @@ void TRACE_smpi_ptp_out (int rank, int src, int dst, const char *operation)
 
   char str[100];
   pajePopState (SIMIX_get_clock(), "MPI_STATE",
-      _TRACE_smpi_container (rank, str, 100));
+      TRACE_smpi_container (rank, str, 100));
 }
 
 void TRACE_smpi_send (int rank, int src, int dst)
@@ -127,9 +127,9 @@ void TRACE_smpi_send (int rank, int src, int dst)
   if (!IS_TRACING_SMPI) return;
 
   char key[100], str[100];
-  _TRACE_smpi_put_key (src, dst, key, 100);
+  TRACE_smpi_put_key (src, dst, key, 100);
   pajeStartLink (SIMIX_get_clock(), "MPI_LINK", "0", "PTP",
-      _TRACE_smpi_container (src, str, 100), key);
+      TRACE_smpi_container (src, str, 100), key);
 }
 
 void TRACE_smpi_recv (int rank, int src, int dst)
@@ -137,9 +137,9 @@ void TRACE_smpi_recv (int rank, int src, int dst)
   if (!IS_TRACING_SMPI) return;
 
   char key[100], str[100];
-  _TRACE_smpi_get_key (src, dst, key, 100);
+  TRACE_smpi_get_key (src, dst, key, 100);
   pajeEndLink (SIMIX_get_clock(), "MPI_LINK", "0", "PTP",
-      _TRACE_smpi_container (dst, str, 100), key);
+      TRACE_smpi_container (dst, str, 100), key);
 }
 #endif
 
diff --git a/src/instr/smx_instr.c b/src/instr/smx_instr.c
index 229b15bf68..1ff402b175 100644
--- a/src/instr/smx_instr.c
+++ b/src/instr/smx_instr.c
@@ -16,12 +16,12 @@ void TRACE_smx_action_execute (smx_action_t act)
   if (!IS_TRACING) return;
 
   act->counter = counter++;
-  category = __TRACE_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);
   }
-  __TRACE_surf_resource_utilization_start (act);
+  TRACE_surf_resource_utilization_start (act);
 }
 
 void TRACE_smx_action_communicate (smx_action_t act, smx_process_t proc)
@@ -30,11 +30,11 @@ void TRACE_smx_action_communicate (smx_action_t act, smx_process_t proc)
   if (!IS_TRACING) return;
 
   act->counter = counter++;
-  category = __TRACE_category_get (proc);
+  category = TRACE_category_get (proc);
   if (category){
     act->category = xbt_strdup (category);
   }
-  __TRACE_surf_resource_utilization_start (act);
+  TRACE_surf_resource_utilization_start (act);
 }
 
 void TRACE_smx_action_destroy (smx_action_t act)
@@ -44,7 +44,7 @@ void TRACE_smx_action_destroy (smx_action_t act)
   if (act->category){
     xbt_free (act->category);
   }
-  __TRACE_surf_resource_utilization_end (act);
+  TRACE_surf_resource_utilization_end (act);
 }
 
 #endif
diff --git a/src/instr/surf_instr.c b/src/instr/surf_instr.c
index ca0f92a61d..5e1573d0aa 100644
--- a/src/instr/surf_instr.c
+++ b/src/instr/surf_instr.c
@@ -21,7 +21,7 @@ static xbt_dict_t resource_variables; /* (host|link)#variable -> value */
 static xbt_dict_t gtnets_src; /* %p (action) -> %s */
 static xbt_dict_t gtnets_dst; /* %p (action) -> %s */
 
-void TRACE_surf_init (void)
+void TRACE_surf_alloc (void)
 {
   created_links = xbt_dict_new();
   host_containers = xbt_dict_new();
@@ -29,14 +29,14 @@ void TRACE_surf_init (void)
   gtnets_src = xbt_dict_new ();
   gtnets_dst = xbt_dict_new ();
 
-  __TRACE_surf_resource_utilization_initialize();
+  TRACE_surf_resource_utilization_alloc();
 }
 
-void TRACE_surf_finalize (void)
+void TRACE_surf_release (void)
 {
   char *key, *value;
   xbt_dict_cursor_t cursor = NULL;
-  __TRACE_surf_resource_utilization_finalize();
+  TRACE_surf_resource_utilization_release();
 
   /* get all host from host_containers */
   xbt_dict_foreach(host_containers, cursor, key, value) {
diff --git a/src/instr/variables_instr.c b/src/instr/variables_instr.c
index 0e9722ac16..aed99a1190 100644
--- a/src/instr/variables_instr.c
+++ b/src/instr/variables_instr.c
@@ -12,7 +12,7 @@
 
 extern routing_global_t global_routing;
 
-void __TRACE_link_variable (double time, const char *src, const char *dst, const char *variable, double value, const char *what)
+void TRACE_user_link_variable (double time, const char *src, const char *dst, const char *variable, double value, const char *what)
 {
   if (!IS_TRACING || !IS_TRACING_PLATFORM) return;
 
@@ -43,7 +43,7 @@ void __TRACE_link_variable (double time, const char *src, const char *dst, const
   }
 }
 
-void __TRACE_host_variable (double time, const char *variable, double value, const char *what)
+void TRACE_user_host_variable (double time, const char *variable, double value, const char *what)
 {
   char valuestr[100];
   if (!IS_TRACING || !IS_TRACING_PLATFORM) return;
diff --git a/src/msg/global.c b/src/msg/global.c
index f874911d88..a3e8ae6b04 100644
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -190,7 +190,7 @@ MSG_error_t MSG_clean(void)
   m_process_t p = NULL;
 
 #ifdef HAVE_TRACING
-  TRACE_surf_finalize();
+  TRACE_surf_release ();
 #endif
 
   while ((p = xbt_fifo_pop(msg_global->process_list))) {
diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 92ab45b1fb..5628164b59 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -235,7 +235,7 @@ int main(int argc, char **argv)
   SIMIX_message_sizes_output("toto.txt");
 
 #ifdef HAVE_TRACING
-  TRACE_smpi_end ();
+  TRACE_smpi_release ();
 #endif
 
   SIMIX_clean();
diff --git a/src/surf/network_vivaldi.c b/src/surf/network_vivaldi.c
index 163182798c..c25b58239c 100644
--- a/src/surf/network_vivaldi.c
+++ b/src/surf/network_vivaldi.c
@@ -269,9 +269,9 @@ void surf_network_model_init_Vivaldi(const char *filename)
                            "Vivaldi", surf_network_model);
 
 #ifdef HAVE_TRACING
-  __TRACE_host_variable(0,"vivaldi_x",0,"declare");
-  __TRACE_host_variable(0,"vivaldi_y",0,"declare");
-  __TRACE_host_variable(0,"vivaldi_h",0,"declare");
+  TRACE_user_host_variable(0,"vivaldi_x",0,"declare");
+  TRACE_user_host_variable(0,"vivaldi_y",0,"declare");
+  TRACE_user_host_variable(0,"vivaldi_h",0,"declare");
 #endif
 
   xbt_cfg_set_string(_surf_cfg_set, "routing", "none");