From 460c08a9cb76ec971ea32986eab98fd19ca5d9a2 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Mon, 30 Apr 2007 08:28:06 +0000 Subject: [PATCH] Merge r6593 (callgrind: fix --collect-systime=yes with "no instrumentation" mode ) git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6711 --- callgrind/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/callgrind/main.c b/callgrind/main.c index 70125497ae..3cf6000147 100644 --- a/callgrind/main.c +++ b/callgrind/main.c @@ -886,7 +886,8 @@ void CLG_(pre_syscalltime)(ThreadId tid, UInt syscallno) static void CLG_(post_syscalltime)(ThreadId tid, UInt syscallno, SysRes res) { - if (CLG_(clo).collect_systime) { + if (CLG_(clo).collect_systime && + CLG_(current_state).bbcc) { Int o = CLG_(sets).off_full_systime; #if CLG_MICROSYSTIME struct vki_timeval tv_now; -- 2.47.2