isolating uncategorized resource utilization tracing to get a cleaner trace

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

diff --git a/src/instr/interface.c b/src/instr/interface.c
index a405db2..573f498 100644 (file)
--- a/src/instr/interface.c
+++ b/src/instr/interface.c
@@ -51,9 +51,11 @@ int TRACE_start()
 
   if (IS_TRACING_PLATFORM) {
     pajeDefineVariableType("power", "HOST", "power");
-    pajeDefineVariableType("power_used", "HOST", "power_used");
+    if (TRACE_uncategorized()){
+      pajeDefineVariableType("power_used", "HOST", "power_used");
+      pajeDefineVariableType("bandwidth_used", "LINK", "bandwidth_used");
+    }
     pajeDefineVariableType("bandwidth", "LINK", "bandwidth");
-    pajeDefineVariableType("bandwidth_used", "LINK", "bandwidth_used");
     pajeDefineVariableType("latency", "LINK", "latency");
     pajeDefineEventType("source", "LINK", "source");
     pajeDefineEventType("destination", "LINK", "destination");
@@ -81,7 +83,11 @@ int TRACE_start()
   }
 
   if (IS_TRACING_SMPI) {
-    pajeDefineContainerType("MPI_PROCESS", "HOST", "MPI_PROCESS");
+    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");
@@ -225,19 +231,4 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
   pajeNewEvent(MSG_get_clock(), mark_type, "0", mark_value);
 }
 
-int TRACE_smpi_set_category(const char *category)
-{
-  //if category is NULL, trace of platform is disabled
-  if (!IS_TRACING)
-    return 1;
-  if (category != NULL) {
-    int ret = TRACE_category(category);
-    TRACE_category_set(SIMIX_process_self(), category);
-    return ret;
-  } else {
-    TRACE_category_unset(SIMIX_process_self());
-    return 0;
-  }
-}
-
 #endif                          /* HAVE_TRACING */