From: schnorr <schnorr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 13 Dec 2010 16:44:33 +0000 (+0000)
Subject: [trace] trace type hierarchy depends on the platform file
X-Git-Tag: v3.6_beta2~757
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1366e8e77954f83b9bdc3762daeffa11f28e4fb0

[trace] trace type hierarchy depends on the platform file

details:
- this commit breaks four tracing options

todo:
- fix type hierarchy definition (and corresponding tracing) for:
    TRACE_msg_process_is_enabled
    TRACE_msg_volume_is_enabled
    TRACE_msg_task_is_enabled
    TRACE_smpi_is_enabled

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9166 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 851ca3d7eb..dfbbb7c70b 100644
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -51,70 +51,57 @@ int TRACE_start()
   /* 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");
-  }
+  if(0){
+//  FIXME
+//  pajeDefineEventType("source", "LINK", "source");
+//  pajeDefineEventType("destination", "LINK", "destination");
 
   /* 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");
-  }
+//  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
    */
-  if (TRACE_msg_task_is_enabled()) {
-    //tasks grouped by host
-    pajeDefineContainerType("TASK", "HOST", "TASK");
-    pajeDefineStateType("category", "TASK", "category");
-    pajeDefineStateType("presence", "TASK", "presence");
-  }
+//  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
    */
-  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");
+//  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");
+//  }
   }
-
-  /* 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();