]> git.ipfire.org Git - thirdparty/valgrind.git/commitdiff
Merge r6593 (callgrind: fix --collect-systime=yes with "no
authorJulian Seward <jseward@acm.org>
Mon, 30 Apr 2007 08:28:06 +0000 (08:28 +0000)
committerJulian Seward <jseward@acm.org>
Mon, 30 Apr 2007 08:28:06 +0000 (08:28 +0000)
instrumentation" mode )

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6711

callgrind/main.c

index 70125497ae1f58f130295199f5e2f01ee0ec2ea5..3cf6000147f9e083275dc904e164a49db8fa4506 100644 (file)
@@ -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;