aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Patard <apatard@mandriva.com>2008-09-19 23:16:25 -0400
committerArjan van de Ven <arjan@linux.intel.com>2008-10-12 11:07:44 -0400
commit8bd9890e94627bc1ef372085e64dda7f9e307e82 (patch)
treea5dbda1d8e78a4471b2fe2b20699e52cd8addcae
parent709790a9aafe424785dd02bcb31b0dddb4ef59e4 (diff)
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>
-rw-r--r--scripts/bootgraph.pl8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/bootgraph.pl b/scripts/bootgraph.pl
index 4e5f4ab2ed7f..2243353fe55d 100644
--- a/scripts/bootgraph.pl
+++ b/scripts/bootgraph.pl
@@ -46,7 +46,7 @@ my $firsttime = 100;
46my $count = 0; 46my $count = 0;
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;
@@ -66,7 +66,7 @@ while (<>) {
66 $count = $count + 1; 66 $count = $count + 1;
67 } 67 }
68 68
69 if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z\_]+)\+.*returned/) { 69 if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z0-9\_]+)\+.*returned/) {
70 if ($done == 0) { 70 if ($done == 0) {
71 $end{$2} = $1; 71 $end{$2} = $1;
72 $maxtime = $1; 72 $maxtime = $1;
@@ -81,8 +81,8 @@ while (<>) {
81} 81}
82 82
83if ($count == 0) { 83if ($count == 0) {
84 print "No data found in the dmesg. Make sure CONFIG_PRINTK_TIME is enabled and\n"; 84 print "No data found in the dmesg. Make sure that 'printk.time=1' and\n";
85 print "that initcall_debug is passed on the kernel command line.\n\n"; 85 print "'initcall_debug' are passed on the kernel command line.\n\n";
86 print "Usage: \n"; 86 print "Usage: \n";
87 print " dmesg | perl scripts/bootgraph.pl > output.svg\n\n"; 87 print " dmesg | perl scripts/bootgraph.pl > output.svg\n\n";
88 exit; 88 exit;