nfs: remove redundant tests on reading new pages

[safe/jmp/linux-2.6] / scripts / bootgraph.pl

diff --git a/scripts/bootgraph.pl b/scripts/bootgraph.pl
index 4baf499..d2c61ef 100644 (file)
--- a/scripts/bootgraph.pl
+++ b/scripts/bootgraph.pl
@@ -37,7 +37,10 @@
 #      dmesg | perl scripts/bootgraph.pl > output.svg
 #
 
-my %start, %end;
+use strict;
+
+my %start;
+my %end;
 my $done = 0;
 my $maxtime = 0;
 my $firsttime = 100;
@@ -46,7 +49,7 @@ my %pids;
 
 while (<>) {
        my $line = $_;
-       if ($line =~ /([0-9\.]+)\] calling  ([a-zA-Z\_]+)\+/) {
+       if ($line =~ /([0-9\.]+)\] calling  ([a-zA-Z0-9\_]+)\+/) {
                my $func = $2;
                if ($done == 0) {
                        $start{$func} = $1;
@@ -60,7 +63,7 @@ while (<>) {
                $count = $count + 1;
        }
 
-       if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z\_]+)\+.*returned/) {
+       if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z0-9\_]+)\+.*returned/) {
                if ($done == 0) {
                        $end{$2} = $1;
                        $maxtime = $1;
@@ -75,8 +78,8 @@ while (<>) {
 }
 
 if ($count == 0) {
-       print "No data found in the dmesg. Make sure CONFIG_PRINTK_TIME is enabled and\n";
-       print "that initcall_debug is passed on the kernel command line.\n\n";
+       print "No data found in the dmesg. Make sure that 'printk.time=1' and\n";
+       print "'initcall_debug' are passed on the kernel command line.\n\n";
        print "Usage: \n";
        print "      dmesg | perl scripts/bootgraph.pl > output.svg\n\n";
        exit;
@@ -105,12 +108,20 @@ my $threshold = ($maxtime - $firsttime) / 60.0;
 my $stylecounter = 0;
 my %rows;
 my $rowscount = 1;
-while (($key,$value) = each %start) {
+my @initcalls = sort { $start{$a} <=> $start{$b} } keys(%start);
+my $key;
+foreach $key (@initcalls) {
        my $duration = $end{$key} - $start{$key};
 
        if ($duration >= $threshold) {
-               my $s, $s2, $e, $y;
-               $s = ($value - $firsttime) * $mult;
+               my ($s, $s2, $e, $w, $y, $y2, $style);
+               my $pid = $pids{$key};
+
+               if (!defined($rows{$pid})) {
+                       $rows{$pid} = $rowscount;
+                       $rowscount = $rowscount + 1;
+               }
+               $s = ($start{$key} - $firsttime) * $mult;
                $s2 = $s + 6;
                $e = ($end{$key} - $firsttime) * $mult;
                $w = $e - $s;
@@ -134,9 +145,9 @@ while (($key,$value) = each %start) {
 my $time = $firsttime;
 my $step = ($maxtime - $firsttime) / 15;
 while ($time < $maxtime) {
-       my $s2 = ($time - $firsttime) * $mult;
+       my $s3 = ($time - $firsttime) * $mult;
        my $tm = int($time * 100) / 100.0;
-       print "<text transform=\"translate($s2,89) rotate(90)\">$tm</text>\n";
+       print "<text transform=\"translate($s3,89) rotate(90)\">$tm</text>\n";
        $time = $time + $step;
 }