|
From: <sv...@va...> - 2007-02-16 21:55:27
|
Author: weidendo
Date: 2007-02-16 21:55:25 +0000 (Fri, 16 Feb 2007)
New Revision: 6601
Log:
Callgrind: Fix threads display of "callgrind_control -s"
Modified:
trunk/callgrind/callgrind_control.in
Modified: trunk/callgrind/callgrind_control.in
===================================================================
--- trunk/callgrind/callgrind_control.in 2007-02-16 20:11:27 UTC (rev 6600)
+++ trunk/callgrind/callgrind_control.in 2007-02-16 21:55:25 UTC (rev 6601)
@@ -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";
}
|