updating the automatic generation of triva's graph configuration

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

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index fe80f66..defc1f5 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -39,7 +39,7 @@ int TRACE_start()
     return 0;
   }
 
-  DEBUG0("Tracing starts");
+  XBT_DEBUG("Tracing starts");
 
   /* open the trace file */
   TRACE_paje_start();
@@ -69,6 +69,10 @@ int TRACE_end()
     TRACE_generate_triva_cat_conf();
   }
 
+  /* dump trace buffer */
+  TRACE_last_timestamp_to_dump = surf_get_clock();
+  TRACE_paje_dump_buffer(1);
+
   /* destroy all data structures of tracing (and free) */
   destroyAllContainers();
 
@@ -77,21 +81,21 @@ int TRACE_end()
 
   /* activate trace */
   TRACE_desactivate ();
-  DEBUG0("Tracing system is shutdown");
+  XBT_DEBUG("Tracing system is shutdown");
   return 0;
 }
 
 void TRACE_activate (void)
 {
-  xbt_assert0 (trace_active==0, "Tracing is already active.");
+  xbt_assert (trace_active==0, "Tracing is already active.");
   trace_active = 1;
-  DEBUG0 ("Tracing is on");
+  XBT_DEBUG ("Tracing is on");
 }
 
 void TRACE_desactivate (void)
 {
   trace_active = 0;
-  DEBUG0 ("Tracing is off");
+  XBT_DEBUG ("Tracing is off");
 }
 
 int TRACE_is_active (void)
@@ -111,7 +115,8 @@ int TRACE_is_configured(void)
 
 int TRACE_smpi_is_enabled(void)
 {
-  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI);
+  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI) &&
+      TRACE_is_enabled();
 }
 
 int TRACE_smpi_is_grouped(void)
@@ -131,17 +136,20 @@ int TRACE_uncategorized (void)
 
 int TRACE_msg_task_is_enabled(void)
 {
-  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK);
+  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK) &&
+      TRACE_is_enabled();
 }
 
 int TRACE_msg_process_is_enabled(void)
 {
-  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS);
+  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS) &&
+      TRACE_is_enabled();
 }
 
 int TRACE_msg_volume_is_enabled(void)
 {
-  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME);
+  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME) &&
+      TRACE_is_enabled();
 }
 
 char *TRACE_get_filename(void)
@@ -350,7 +358,7 @@ void TRACE_generate_triva_uncat_conf (void)
     char *name, *value;
 
     FILE *file = fopen (output, "w");
-    xbt_assert1 (file != NULL,
+    xbt_assert (file != NULL,
        "Unable to open file (%s) for writing triva graph "
        "configuration (uncategorized).", output);
 
@@ -374,45 +382,18 @@ void TRACE_generate_triva_uncat_conf (void)
         ");\n"
         "\n");
 
-    //register each NODE type layout
-    xbt_dict_foreach(trivaNodeTypes, cursor, name, value) {
-      fprintf (file, "  %s = {\n", name);
-      if (strcmp (name, "HOST") == 0){
-        fprintf (file,
-            "    type = node;\n"
-            "    size = power;\n"
-            "    host_sep = {\n"
-            "      type = separation;\n"
-            "      size = power;\n"
-            "      values = (power_used);\n"
-            "    };\n");
-      }else if (strcmp (name, "ROUTER") == 0){
-        fprintf (file,
-            "    type = node;\n"
-            "    size = 10;\n");
-      }else if (strcmp (name, "LINK") == 0){
-        fprintf (file,
-            "    type = edge;\n"
-            "    size = bandwidth;\n"
-            "    scale = global;\n"
-            "    link_sep = {\n"
-            "      type = separation;\n"
-            "      size = bandwidth;\n"
-            "      values = (bandwidth_used);\n"
-            "    };\n");
-      }
-      fprintf (file, "  };\n\n");
-    }
-
-    //EDGE configuration
-    xbt_dict_foreach(trivaEdgeTypes, cursor, name, value) {
-      fprintf (file, "  %s = { size = 1; };\n", name);
-    }
-
-    //graphviz configuration
-    fprintf (file, "\n");
-    fprintf (file, "  graphviz-algorithm = neato;\n");
-
+    //configuration for all nodes
+    fprintf (file,
+        "  host = {\n"
+        "    type = square;\n"
+        "    size = power;\n"
+        "    values = (power_used);\n"
+        "  };\n"
+        "  link = {\n"
+        "    type = rhombus;\n"
+        "    size = bandwidth;\n"
+        "    values = (bandwidth_used);\n"
+        "  };\n");
     //close
     fprintf (file, "}\n");
     fclose (file);
@@ -428,12 +409,12 @@ void TRACE_generate_triva_cat_conf (void)
 
     //check if we do have categories declared
     if (xbt_dict_length(created_categories) == 0){
-      INFO0("No categories declared, ignoring generation of triva graph configuration");
+      XBT_INFO("No categories declared, ignoring generation of triva graph configuration");
       return;
     }
 
     FILE *file = fopen (output, "w");
-    xbt_assert1 (file != NULL,
+    xbt_assert (file != NULL,
        "Unable to open file (%s) for writing triva graph "
        "configuration (categorized).", output);
 
@@ -457,55 +438,28 @@ void TRACE_generate_triva_cat_conf (void)
         ");\n"
         "\n");
 
-    //register each NODE type layout
-    xbt_dict_foreach(trivaNodeTypes, cursor, name, value) {
-      fprintf (file, "  %s = {\n", name);
-      if (strcmp (name, "HOST") == 0){
-        fprintf (file,
-            "    type = node;\n"
-            "    size = power;\n"
-            "    host_sep = {\n"
-            "      type = separation;\n"
-            "      size = power;\n"
-            "      values = (");
-        xbt_dict_foreach(created_categories,cursor2,name2,value2) {
-          fprintf (file, "%s, ", name2);
-        }
-        fprintf (file,
-            ");\n"
-            "    };\n");
-      }else if (strcmp (name, "ROUTER") == 0){
-        fprintf (file,
-            "    type = node;\n"
-            "    size = 10;\n");
-      }else if (strcmp (name, "LINK") == 0){
-        fprintf (file,
-            "    type = edge;\n"
-            "    size = bandwidth;\n"
-            "    scale = global;\n"
-            "    link_sep = {\n"
-            "      type = separation;\n"
-            "      size = bandwidth;\n"
-            "      values = (");
-        xbt_dict_foreach(created_categories,cursor2,name2,value2) {
-          fprintf (file, "%s, ", name2);
-        }
-        fprintf (file,
-            ");\n"
-            "    };\n");
-      }
-      fprintf (file, "  };\n\n");
+    //configuration for all nodes
+    fprintf (file,
+        "  host = {\n"
+        "    type = square;\n"
+        "    size = power;\n"
+        "    values = (");
+    xbt_dict_foreach(created_categories,cursor2,name2,value2) {
+      fprintf (file, "%s, ", name2);
     }
-
-    //EDGE configuration
-    xbt_dict_foreach(trivaEdgeTypes, cursor, name, value) {
-      fprintf (file, "  %s = { size = 1; };\n", name);
+    fprintf (file,
+        ");\n"
+        "  };\n"
+        "  link = {\n"
+        "    type = rhombus;\n"
+        "    size = bandwidth;\n"
+        "    values = (");
+    xbt_dict_foreach(created_categories,cursor2,name2,value2) {
+      fprintf (file, "%s, ", name2);
     }
-
-    //graphviz configuration
-    fprintf (file, "\n");
-    fprintf (file, "  graphviz-algorithm = neato;\n");
-
+    fprintf (file,
+        ");\n"
+        "  };\n");
     //close
     fprintf (file, "}\n");
     fclose (file);