X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1366e8e77954f83b9bdc3762daeffa11f28e4fb0..dbb6723a79b9b957971b41da882cf31cf292aa4c:/src/instr/instr_config.c

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index dfbbb7c70b..9ee6472b04 100644
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -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,66 +47,9 @@ int TRACE_start()
   /* activate trace */
   TRACE_activate ();
 
-  /* base type hierarchy:
-   * --cfg=tracing
-   */
-  if(0){
-//  FIXME
-//  pajeDefineEventType("source", "LINK", "source");
-//  pajeDefineEventType("destination", "LINK", "destination");
-
-  /* type hierarchy for:
-   * --cfg=tracing/msg/process
-   * --cfg=tracing/msg/volume
-   */
-//  FIXME
-//  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
-   */
-//  FIXME
-//  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
-   */
-//  FIXME
-//  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");
-//  }
-  }
   /* 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;
 }