comment some dead code marked 'that doesn't work' which raised a unused-but-set-varia...

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

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index 5c228a8..fabcf00 100644 (file)
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -27,11 +27,13 @@ void TRACE_category(const char *category)
 
 void TRACE_category_with_color (const char *category, const char *color)
 {
-  if (!(TRACE_is_active() && category != NULL))
-    return;
+  /* safe switch */
+  if (!TRACE_is_enabled()) return;
 
-  xbt_assert (instr_platform_traced(),
-      "%s must be called after environment creation", __FUNCTION__);
+  if (!(TRACE_categorized() && category != NULL)) return;
+
+  /* if platform is not traced, we can't deal with categories */
+  if (!TRACE_needs_platform()) return;
 
   //check if category is already created
   char *created = xbt_dict_get_or_null(created_categories, category);
@@ -53,17 +55,15 @@ void TRACE_category_with_color (const char *category, const char *color)
   XBT_DEBUG("CAT,declare %s, %s", category, final_color);
 
   //define the type of this category on top of hosts and links
-  if (TRACE_categorized ()){
-    instr_new_variable_type (category, final_color);
-  }
+  instr_new_variable_type (category, final_color);
 }
 
 void TRACE_declare_mark(const char *mark_type)
 {
-  if (!TRACE_is_active())
-    return;
-  if (!mark_type)
-    return;
+  /* safe switch */
+  if (!TRACE_is_enabled()) return;
+
+  if (!mark_type) return;
 
   XBT_DEBUG("MARK,declare %s", mark_type);
   getEventType(mark_type, NULL, getRootType());
@@ -71,10 +71,10 @@ void TRACE_declare_mark(const char *mark_type)
 
 void TRACE_mark(const char *mark_type, const char *mark_value)
 {
-  if (!TRACE_is_active())
-    return;
-  if (!mark_type || !mark_value)
-    return;
+  /* safe switch */
+  if (!TRACE_is_enabled()) return;
+
+  if (!mark_type || !mark_value) return;
 
   XBT_DEBUG("MARK %s %s", mark_type, mark_value);
   type_t type = getEventType (mark_type, NULL, getRootContainer()->type);
@@ -87,20 +87,21 @@ static void instr_user_variable(double time,
                          const char *variable,
                          const char *father_type,
                          double value,
-                         InstrUserVariable what)
+                         InstrUserVariable what,
+                         const char *color)
 {
-  if (!TRACE_is_active())
-    return;
+  /* safe switch */
+  if (!TRACE_is_enabled()) return;
 
-  xbt_assert (instr_platform_traced(),
-      "%s must be called after environment creation", __FUNCTION__);
+  /* if platform is not traced, we can't deal user variables */
+  if (!TRACE_needs_platform()) return;
 
   char valuestr[100];
   snprintf(valuestr, 100, "%g", value);
 
   switch (what){
   case INSTR_US_DECLARE:
-    instr_new_user_variable_type (father_type, variable, NULL);
+    instr_new_user_variable_type (father_type, variable, color);
     break;
   case INSTR_US_SET:
   {
@@ -142,7 +143,7 @@ static void instr_user_srcdst_variable(double time,
   void *link;
   xbt_dynar_foreach (route, i, link) {
     char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
-    instr_user_variable (time, link_name, variable, father_type, value, what);
+    instr_user_variable (time, link_name, variable, father_type, value, what, NULL);
   }
 }
 
@@ -155,9 +156,7 @@ const char *TRACE_node_name (xbt_node_t node)
 
 xbt_graph_t TRACE_platform_graph (void)
 {
-  if (!TRACE_is_enabled())
-    return NULL;
-
+  if (!TRACE_is_enabled()) return NULL;
   return instr_routing_platform_graph ();
 }
 
@@ -176,7 +175,12 @@ void TRACE_platform_graph_export_graphviz (xbt_graph_t g, const char *filename)
 /* for host variables */
 void TRACE_host_variable_declare (const char *var)
 {
-  instr_user_variable(0, NULL, var, "HOST", 0, INSTR_US_DECLARE);
+  instr_user_variable(0, NULL, var, "HOST", 0, INSTR_US_DECLARE, NULL);
+}
+
+void TRACE_host_variable_declare_with_color (const char *var, const char *color)
+{
+  instr_user_variable(0, NULL, var, "HOST", 0, INSTR_US_DECLARE, color);
 }
 
 void TRACE_host_variable_set (const char *host, const char *variable, double value)
@@ -196,23 +200,28 @@ void TRACE_host_variable_sub (const char *host, const char *variable, double val
 
 void TRACE_host_variable_set_with_time (double time, const char *host, const char *variable, double value)
 {
-  instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SET);
+  instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SET, NULL);
 }
 
 void TRACE_host_variable_add_with_time (double time, const char *host, const char *variable, double value)
 {
-  instr_user_variable(time, host, variable, "HOST", value, INSTR_US_ADD);
+  instr_user_variable(time, host, variable, "HOST", value, INSTR_US_ADD, NULL);
 }
 
 void TRACE_host_variable_sub_with_time (double time, const char *host, const char *variable, double value)
 {
-  instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SUB);
+  instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SUB, NULL);
 }
 
 /* for link variables */
 void TRACE_link_variable_declare (const char *var)
 {
-  instr_user_variable (0, NULL, var, "LINK", 0, INSTR_US_DECLARE);
+  instr_user_variable (0, NULL, var, "LINK", 0, INSTR_US_DECLARE, NULL);
+}
+
+void TRACE_link_variable_declare_with_color (const char *var, const char *color)
+{
+  instr_user_variable (0, NULL, var, "LINK", 0, INSTR_US_DECLARE, color);
 }
 
 void TRACE_link_variable_set (const char *link, const char *variable, double value)
@@ -232,17 +241,17 @@ void TRACE_link_variable_sub (const char *link, const char *variable, double val
 
 void TRACE_link_variable_set_with_time (double time, const char *link, const char *variable, double value)
 {
-  instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SET);
+  instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SET, NULL);
 }
 
 void TRACE_link_variable_add_with_time (double time, const char *link, const char *variable, double value)
 {
-  instr_user_variable (time, link, variable, "LINK", value, INSTR_US_ADD);
+  instr_user_variable (time, link, variable, "LINK", value, INSTR_US_ADD, NULL);
 }
 
 void TRACE_link_variable_sub_with_time (double time, const char *link, const char *variable, double value)
 {
-  instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SUB);
+  instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SUB, NULL);
 }
 
 /* for link variables, but with src and dst used for get_route */