From c94539cc65cb690b9e22ccd1b7654f2c7bd18d77 Mon Sep 17 00:00:00 2001 From: schnorr Date: Tue, 9 Nov 2010 22:55:40 +0000 Subject: [PATCH 1/1] 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 --- src/instr/interface.c | 6 ++++-- src/instr/resource_utilization.c | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/instr/interface.c b/src/instr/interface.c index bf898aabad..573f498e0d 100644 --- 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"); diff --git a/src/instr/resource_utilization.c b/src/instr/resource_utilization.c index 06b29698b5..67afd94620 100644 --- 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; - //trace uncategorized link utilization 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); + } //trace categorized utilization if (!IS_TRACED(surf_action)) -- 2.20.1