|
From: <sv...@va...> - 2007-04-30 08:28:08
|
Author: sewardj
Date: 2007-04-30 09:28:06 +0100 (Mon, 30 Apr 2007)
New Revision: 6711
Log:
Merge r6593 (callgrind: fix --collect-systime=yes with "no
instrumentation" mode )
Modified:
branches/VALGRIND_3_2_BRANCH/callgrind/main.c
Modified: branches/VALGRIND_3_2_BRANCH/callgrind/main.c
===================================================================
--- branches/VALGRIND_3_2_BRANCH/callgrind/main.c 2007-04-30 07:43:01 UTC (rev 6710)
+++ branches/VALGRIND_3_2_BRANCH/callgrind/main.c 2007-04-30 08:28:06 UTC (rev 6711)
@@ -886,7 +886,8 @@
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;
|