new variable for surf_action_t to contain its tracing category

[simgrid.git] / src / surf / network_vivaldi.c

diff --git a/src/surf/network_vivaldi.c b/src/surf/network_vivaldi.c
index 1631827..5698b44 100644 (file)
--- a/src/surf/network_vivaldi.c
+++ b/src/surf/network_vivaldi.c
@@ -46,6 +46,9 @@ static int netviva_action_unref(surf_action_t action)
   action->refcount--;
   if (!action->refcount) {
     xbt_swag_remove(action, action->state_set);
+#ifdef HAVE_TRACING
+    if (action->category) xbt_free (action->category);
+#endif
     free(action);
     return 1;
   }
@@ -269,9 +272,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");