X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41dd9405e023a6edd042bc02e5fd48c90aee5d56..1a7a3e5a1f23fee5399f22654d1f696f2a145763:/src/instr/instr_config.c

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 718c92c5f0..defc1f54a6 100644
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -9,18 +9,99 @@
 
 #ifdef HAVE_TRACING
 
+XBT_LOG_NEW_CATEGORY(instr, "Logging the behavior of the tracing system (used for Visualization/Analysis of simulations)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
+
 #define OPT_TRACING               "tracing"
 #define OPT_TRACING_SMPI          "tracing/smpi"
 #define OPT_TRACING_SMPI_GROUP    "tracing/smpi/group"
-#define OPT_TRACING_PLATFORM      "tracing/platform"
+#define OPT_TRACING_CATEGORIZED   "tracing/categorized"
 #define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized"
 #define OPT_TRACING_MSG_TASK      "tracing/msg/task"
 #define OPT_TRACING_MSG_PROCESS   "tracing/msg/process"
 #define OPT_TRACING_MSG_VOLUME    "tracing/msg/volume"
 #define OPT_TRACING_FILENAME      "tracing/filename"
 #define OPT_TRACING_PLATFORM_METHOD "tracing/platform/method"
+#define OPT_TRIVA_UNCAT_CONF      "triva/uncategorized"
+#define OPT_TRIVA_CAT_CONF        "triva/categorized"
 
 static int trace_configured = 0;
+static int trace_active = 0;
+
+xbt_dict_t created_categories; //declared in instr_interface.c
+
+int TRACE_start()
+{
+  // tracing system must be:
+  //    - enabled (with --cfg=tracing:1)
+  //    - already configured (TRACE_global_init already called)
+  if (!(TRACE_is_enabled() && TRACE_is_configured())){
+    return 0;
+  }
+
+  XBT_DEBUG("Tracing starts");
+
+  /* open the trace file */
+  TRACE_paje_start();
+
+  /* activate trace */
+  TRACE_activate ();
+
+  /* other trace initialization */
+  created_categories = xbt_dict_new();
+  TRACE_surf_alloc();
+  TRACE_smpi_alloc();
+  return 0;
+}
+
+int TRACE_end()
+{
+  if (!TRACE_is_active())
+    return 1;
+
+  /* generate uncategorized graph configuration for triva */
+  if (TRACE_get_triva_uncat_conf()){
+    TRACE_generate_triva_uncat_conf();
+  }
+
+  /* generate categorized graph configuration for triva */
+  if (TRACE_get_triva_cat_conf()){
+    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();
+
+  /* close the trace file */
+  TRACE_paje_end();
+
+  /* activate trace */
+  TRACE_desactivate ();
+  XBT_DEBUG("Tracing system is shutdown");
+  return 0;
+}
+
+void TRACE_activate (void)
+{
+  xbt_assert (trace_active==0, "Tracing is already active.");
+  trace_active = 1;
+  XBT_DEBUG ("Tracing is on");
+}
+
+void TRACE_desactivate (void)
+{
+  trace_active = 0;
+  XBT_DEBUG ("Tracing is off");
+}
+
+int TRACE_is_active (void)
+{
+  return trace_active;
+}
 
 int TRACE_is_enabled(void)
 {
@@ -34,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)
@@ -42,9 +124,9 @@ int TRACE_smpi_is_grouped(void)
   return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_GROUP);
 }
 
-int TRACE_platform_is_enabled(void)
+int TRACE_categorized (void)
 {
-  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_PLATFORM);
+  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_CATEGORIZED);
 }
 
 int TRACE_uncategorized (void)
@@ -54,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)
@@ -77,6 +162,16 @@ char *TRACE_get_platform_method(void)
   return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_PLATFORM_METHOD);
 }
 
+char *TRACE_get_triva_uncat_conf (void)
+{
+  return xbt_cfg_get_string(_surf_cfg_set, OPT_TRIVA_UNCAT_CONF);
+}
+
+char *TRACE_get_triva_cat_conf (void)
+{
+  return xbt_cfg_get_string(_surf_cfg_set, OPT_TRIVA_CAT_CONF);
+}
+
 void TRACE_global_init(int *argc, char **argv)
 {
   /* name of the tracefile */
@@ -110,7 +205,7 @@ void TRACE_global_init(int *argc, char **argv)
 
   /* platform */
   int default_tracing_platform = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM,
+  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_CATEGORIZED,
                    "Tracing of categorized platform (host and link) utilization.",
                    xbt_cfgelm_int, &default_tracing_platform, 0, 1,
                    NULL, NULL);
@@ -150,6 +245,20 @@ void TRACE_global_init(int *argc, char **argv)
                    xbt_cfgelm_int, &default_tracing_msg_volume, 0, 1,
                    NULL, NULL);
 
+  /* Triva graph configuration for uncategorized tracing */
+  char *default_triva_uncat_conf_file = xbt_strdup ("");
+  xbt_cfg_register(&_surf_cfg_set, OPT_TRIVA_UNCAT_CONF,
+                   "Triva Graph configuration file for uncategorized resource utilization traces.",
+                   xbt_cfgelm_string, &default_triva_uncat_conf_file, 1, 1,
+                   NULL, NULL);
+
+  /* Triva graph configuration for uncategorized tracing */
+  char *default_triva_cat_conf_file = xbt_strdup ("");
+  xbt_cfg_register(&_surf_cfg_set, OPT_TRIVA_CAT_CONF,
+                   "Triva Graph configuration file for categorized resource utilization traces.",
+                   xbt_cfgelm_string, &default_triva_cat_conf_file, 1, 1,
+                   NULL, NULL);
+
   /* instrumentation can be considered configured now */
   trace_configured = 1;
 }
@@ -174,7 +283,7 @@ void TRACE_help (int detailed)
       "  It activates the tracing system and register the simulation platform\n"
       "  in the trace file. You have to enable this option to others take effect.",
       detailed);
-  print_line (OPT_TRACING_PLATFORM, "Trace categorized resource utilization",
+  print_line (OPT_TRACING_CATEGORIZED, "Trace categorized resource utilization",
       "  It activates the categorized resource utilization tracing. It should\n"
       "  be enabled if tracing categories are used by this simulator.",
       detailed);
@@ -225,17 +334,149 @@ void TRACE_help (int detailed)
       "  This experimental option only has effect if this simulator is MSG-based.\n"
       "  It traces the communication volume of MSG send/receive.",
       detailed);
+  print_line (OPT_TRIVA_UNCAT_CONF, "Generate graph configuration for Triva",
+      "  This option can be used in all types of simulators build with SimGrid\n"
+      "  to generate a uncategorized resource utilization graph to be used as\n"
+      "  configuration for the Triva visualization analysis. This option\n"
+      "  can be used with tracing/categorized:1 and tracing:1 options to\n"
+      "  analyze an unmodified simulator before changing it to contain\n"
+      "  categories.",
+      detailed);
+  print_line (OPT_TRIVA_CAT_CONF, "generate uncategorized graph configuration for Triva",
+      "  This option can be used if this simulator uses tracing categories\n"
+      "  in its code. The file specified by this option holds a graph configuration\n"
+      "  file for the Triva visualization tool that can be used to analyze a categorized\n"
+      "  resource utilization.",
+      detailed);
+}
+
+void TRACE_generate_triva_uncat_conf (void)
+{
+  char *output = TRACE_get_triva_uncat_conf ();
+  if (output && strlen(output) > 0){
+    xbt_dict_cursor_t cursor=NULL;
+    char *name, *value;
+
+    FILE *file = fopen (output, "w");
+    xbt_assert (file != NULL,
+       "Unable to open file (%s) for writing triva graph "
+       "configuration (uncategorized).", output);
+
+    //open
+    fprintf (file, "{\n");
+
+    //register NODE types
+    fprintf (file, "  node = (");
+    xbt_dict_foreach(trivaNodeTypes, cursor, name, value) {
+      fprintf (file, "%s, ", name);
+    }
+
+    //register EDGE types
+    fprintf (file,
+        ");\n"
+        "  edge = (");
+    xbt_dict_foreach(trivaEdgeTypes, cursor, name, value) {
+      fprintf (file, "%s, ", name);
+    }
+    fprintf (file,
+        ");\n"
+        "\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);
+  }
+}
+
+void TRACE_generate_triva_cat_conf (void)
+{
+  char *output = TRACE_get_triva_cat_conf();
+  if (output && strlen(output) > 0){
+    xbt_dict_cursor_t cursor=NULL, cursor2=NULL;
+    char *name, *name2, *value, *value2;
+
+    //check if we do have categories declared
+    if (xbt_dict_length(created_categories) == 0){
+      XBT_INFO("No categories declared, ignoring generation of triva graph configuration");
+      return;
+    }
+
+    FILE *file = fopen (output, "w");
+    xbt_assert (file != NULL,
+       "Unable to open file (%s) for writing triva graph "
+       "configuration (categorized).", output);
+
+    //open
+    fprintf (file, "{\n");
+
+    //register NODE types
+    fprintf (file, "  node = (");
+    xbt_dict_foreach(trivaNodeTypes, cursor, name, value) {
+      fprintf (file, "%s, ", name);
+    }
+
+    //register EDGE types
+    fprintf (file,
+        ");\n"
+        "  edge = (");
+    xbt_dict_foreach(trivaEdgeTypes, cursor, name, value) {
+      fprintf (file, "%s, ", name);
+    }
+    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);
+    }
+    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);
+    }
+    fprintf (file,
+        ");\n"
+        "  };\n");
+    //close
+    fprintf (file, "}\n");
+    fclose (file);
+  }
 }
 
 #undef OPT_TRACING
 #undef OPT_TRACING_SMPI
 #undef OPT_TRACING_SMPI_GROUP
-#undef OPT_TRACING_PLATFORM
+#undef OPT_TRACING_CATEGORIZED
 #undef OPT_TRACING_UNCATEGORIZED
 #undef OPT_TRACING_MSG_TASK
 #undef OPT_TRACING_MSG_PROCESS
 #undef OPT_TRACING_MSG_VOLUME
 #undef OPT_TRACING_FILENAME
 #undef OPT_TRACING_PLATFORM_METHOD
+#undef OPT_TRIVA_UNCAT_CONF
+#undef OPT_TRIVA_CAT_CONF
 
 #endif /* HAVE_TRACING */