aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Patard <apatard@mandriva.com>2008-09-19 23:16:25 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-14 04:39:33 -0400
commit5c542368a3ded88bed98239fb3570dda416203ee (patch)
treed3b120959f1af5f1736d25020eda1b9abedcb642
parent80a398a55d3096ff4572b44271d095413749ebb4 (diff)
tracing/fastboot: fix bootgraph.pl initcall name regexp
The regexp used to match the start and the end of an initcall are matching only on [a-zA-Z\_]. This rules out initcalls with a number in them. This patch is fixing that. Signed-off-by: Arnaud Patard <apatard@mandriva.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--scripts/bootgraph.pl8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/bootgraph.pl b/scripts/bootgraph.pl
index 4baf49985589..479fb4ea8914 100644
--- a/scripts/bootgraph.pl
+++ b/scripts/bootgraph.pl
@@ -46,7 +46,7 @@ my %pids;
46 46
47while (<>) { 47while (<>) {
48 my $line = $_; 48 my $line = $_;
49 if ($line =~ /([0-9\.]+)\] calling ([a-zA-Z\_]+)\+/) { 49 if ($line =~ /([0-9\.]+)\] calling ([a-zA-Z0-9\_]+)\+/) {
50 my $func = $2; 50 my $func = $2;
51 if ($done == 0) { 51 if ($done == 0) {
52 $start{$func} = $1; 52 $start{$func} = $1;
@@ -60,7 +60,7 @@ while (<>) {
60 $count = $count + 1; 60 $count = $count + 1;
61 } 61 }
62 62
63 if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z\_]+)\+.*returned/) { 63 if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z0-9\_]+)\+.*returned/) {
64 if ($done == 0) { 64 if ($done == 0) {
65 $end{$2} = $1; 65 $end{$2} = $1;
66 $maxtime = $1; 66 $maxtime = $1;
@@ -75,8 +75,8 @@ while (<>) {
75} 75}
76 76
77if ($count == 0) { 77if ($count == 0) {
78 print "No data found in the dmesg. Make sure CONFIG_PRINTK_TIME is enabled and\n"; 78 print "No data found in the dmesg. Make sure that 'printk.time=1' and\n";
79 print "that initcall_debug is passed on the kernel command line.\n\n"; 79 print "'initcall_debug' are passed on the kernel command line.\n\n";
80 print "Usage: \n"; 80 print "Usage: \n";
81 print " dmesg | perl scripts/bootgraph.pl > output.svg\n\n"; 81 print " dmesg | perl scripts/bootgraph.pl > output.svg\n\n";
82 exit; 82 exit;