[trace] removing old code that was merged into new tracing system

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

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 2571250..9ee6472 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -15,7 +15,7 @@ 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/categorized"
+#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"
@@ -28,8 +28,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
 static int trace_configured = 0;
 static int trace_active = 0;
 
-extern xbt_dict_t created_categories; //declared in instr_interface.c
-extern xbt_dict_t defined_types; //declared in instr_interface.c
+xbt_dict_t created_categories; //declared in instr_interface.c
 
 int TRACE_start()
 {
@@ -48,79 +47,9 @@ int TRACE_start()
   /* activate trace */
   TRACE_activate ();
 
-  /* base type hierarchy:
-   * --cfg=tracing
-   */
-  pajeDefineContainerType("PLATFORM", "0", "platform");
-  pajeDefineContainerType("HOST", "PLATFORM", "HOST");
-  pajeDefineContainerType("LINK", "PLATFORM", "LINK");
-  pajeDefineVariableType("power", "HOST", "power");
-  pajeDefineVariableType("bandwidth", "LINK", "bandwidth");
-  pajeDefineVariableType("latency", "LINK", "latency");
-  pajeDefineEventType("source", "LINK", "source");
-  pajeDefineEventType("destination", "LINK", "destination");
-
-  /* type hierarchy for:
-   * --cfg=tracing/uncategorized
-   */
-  if (TRACE_uncategorized()){
-    pajeDefineVariableTypeWithColor("power_used", "HOST", "power_used", "0.5 0.5 0.5");
-    pajeDefineVariableTypeWithColor("bandwidth_used", "LINK", "bandwidth_used", "0.5 0.5 0.5");
-  }
-
-  /* type hierarchy for:
-   * --cfg=tracing/msg/process
-   * --cfg=tracing/msg/volume
-   */
-  if (TRACE_msg_process_is_enabled() || TRACE_msg_volume_is_enabled()) {
-    //processes grouped by host
-    pajeDefineContainerType("PROCESS", "HOST", "PROCESS");
-  }
-
-  if (TRACE_msg_process_is_enabled()) {
-    pajeDefineStateType("category", "PROCESS", "category");
-    pajeDefineStateType("presence", "PROCESS", "presence");
-  }
-
-  if (TRACE_msg_volume_is_enabled()) {
-    pajeDefineLinkType("volume", "0", "PROCESS", "PROCESS", "volume");
-  }
-
-  /* type hierarchy for:
-   * --cfg=tracing/msg/task
-   */
-  if (TRACE_msg_task_is_enabled()) {
-    //tasks grouped by host
-    pajeDefineContainerType("TASK", "HOST", "TASK");
-    pajeDefineStateType("category", "TASK", "category");
-    pajeDefineStateType("presence", "TASK", "presence");
-  }
-
-  /* type hierarchy for
-   * --cfg=tracing/smpi
-   * --cfg=tracing/smpi/group
-   */
-  if (TRACE_smpi_is_enabled()) {
-    if (TRACE_smpi_is_grouped()){
-      pajeDefineContainerType("MPI_PROCESS", "HOST", "MPI_PROCESS");
-    }else{
-      pajeDefineContainerType("MPI_PROCESS", "PLATFORM", "MPI_PROCESS");
-    }
-    pajeDefineStateType("MPI_STATE", "MPI_PROCESS", "MPI_STATE");
-    pajeDefineLinkType("MPI_LINK", "0", "MPI_PROCESS", "MPI_PROCESS",
-                       "MPI_LINK");
-  }
-
-  /* creating the platform */
-  pajeCreateContainer(MSG_get_clock(), "platform", "PLATFORM", "0",
-                      "simgrid-platform");
-
   /* other trace initialization */
-  defined_types = xbt_dict_new();
   created_categories = xbt_dict_new();
-  TRACE_msg_task_alloc();
   TRACE_surf_alloc();
-  TRACE_msg_process_alloc();
   TRACE_smpi_alloc();
   return 0;
 }
@@ -187,9 +116,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)
@@ -265,7 +194,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);
@@ -343,7 +272,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);
@@ -478,7 +407,7 @@ void TRACE_generate_triva_cat_conf (void)
         "      size = power;\n"
         "      values = (");
     xbt_dict_foreach(created_categories,cursor,key,data) {
-      fprintf(file, "p%s, ",key);
+      fprintf(file, "%s, ",key);
     }
     fprintf (file,
         ");\n"
@@ -494,7 +423,7 @@ void TRACE_generate_triva_cat_conf (void)
         "      size = bandwidth;\n"
         "      values = (");
     xbt_dict_foreach(created_categories,cursor,key,data) {
-      fprintf(file, "b%s, ",key);
+      fprintf(file, "%s, ",key);
     }
     fprintf (file,
         ");\n"
@@ -510,7 +439,7 @@ void TRACE_generate_triva_cat_conf (void)
 #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