isolating uncategorized resource utilization tracing to get a cleaner trace

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

diff --git a/src/instr/interface.c b/src/instr/interface.c
index bf898aa..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");
 
   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", "LINK", "bandwidth");

-    pajeDefineVariableType("bandwidth_used", "LINK", "bandwidth_used");

     pajeDefineVariableType("latency", "LINK", "latency");
     pajeDefineEventType("source", "LINK", "source");
     pajeDefineEventType("destination", "LINK", "destination");
     pajeDefineVariableType("latency", "LINK", "latency");
     pajeDefineEventType("source", "LINK", "source");
     pajeDefineEventType("destination", "LINK", "destination");

diff --git a/src/instr/resource_utilization.c b/src/instr/resource_utilization.c
index 06b2969..67afd94 100644 (file)
--- a/src/instr/resource_utilization.c
+++ b/src/instr/resource_utilization.c
@@ -383,11 +383,14 @@ void TRACE_surf_link_set_utilization(void *link, smx_action_t smx_action,
   if (!value)
     return;
 
   if (!value)
     return;
 

-  //trace uncategorized link utilization

   char resource[100];
   snprintf(resource, 100, "%p", link);
   char resource[100];
   snprintf(resource, 100, "%p", link);

-  TRACE_surf_resource_utilization_event(smx_action, now, delta,
+
+  //trace uncategorized link utilization
+  if (TRACE_uncategorized()){
+    TRACE_surf_resource_utilization_event(smx_action, now, delta,

                                         "bandwidth_used", resource, value);
                                         "bandwidth_used", resource, value);

+  }

 
   //trace categorized utilization
   if (!IS_TRACED(surf_action))
 
   //trace categorized utilization
   if (!IS_TRACED(surf_action))