|
From: <sv...@va...> - 2007-04-30 08:36:53
|
Author: sewardj
Date: 2007-04-30 09:36:52 +0100 (Mon, 30 Apr 2007)
New Revision: 6712
Log:
Merge r6601 (Callgrind: Fix threads display of "callgrind_control -s")
Modified:
branches/VALGRIND_3_2_BRANCH/callgrind/callgrind_control.in
Modified: branches/VALGRIND_3_2_BRANCH/callgrind/callgrind_control.in
===================================================================
--- branches/VALGRIND_3_2_BRANCH/callgrind/callgrind_control.in 2007-04-30 08:28:06 UTC (rev 6711)
+++ branches/VALGRIND_3_2_BRANCH/callgrind/callgrind_control.in 2007-04-30 08:36:52 UTC (rev 6712)
@@ -370,6 +370,7 @@
%calls = ();
%events = ();
@events = ();
+ @threads = ();
%totals = ();
$exec_bbs = 0;
@@ -378,7 +379,7 @@
$dist_calls = 0;
$dist_ctxs = 0;
$dist_funcs = 0;
- $threads = 0;
+ $threads = "";
$events = "";
while(<RESULT>) {
@@ -410,7 +411,7 @@
elsif (/distinct-functions: (\d+)/) { $dist_funcs = $1; }
elsif (/distinct-contexts: (\d+)/) { $dist_ctxs = $1; }
elsif (/events: (.+)$/) { $events = $1; prepareEvents; }
- elsif (/threads: (\d+)$/) { $threads = $1; }
+ elsif (/threads: (.+)$/) { $threads = $1; @threads = split " ", $threads; }
elsif (/instrumentation: (\w+)$/) { $instrumentation = $1; }
}
@@ -423,7 +424,7 @@
if ($printStatus) {
if ($requestEvents <1) {
- print " Number of threads: $threads\n";
+ print " Number of running threads: " .($#threads+1). ", thread IDs: $threads\n";
print " Events collected: $events\n";
}
|