1 files changed, 50 insertions, 6 deletions

diff --git a/scripts/bootgraph.pl b/scripts/bootgraph.pl
index f0af9aa9b243..b0246307aac4 100644
--- a/scripts/bootgraph.pl
+++ b/scripts/bootgraph.pl
@@ -41,11 +41,13 @@ use strict;
 
 my %start;
 my %end;
+my %type;
 my $done = 0;
 my $maxtime = 0;
 my $firsttime = 100;
 my $count = 0;
 my %pids;
+my %pidctr;
 
 while (<>) {
         my $line = $_;
@@ -53,6 +55,7 @@ while (<>) {
                 my $func = $2;
                 if ($done == 0) {
                         $start{$func} = $1;
+                        $type{$func} = 0;
                         if ($1 < $firsttime) {
                                 $firsttime = $1;
                         }
@@ -63,12 +66,40 @@ while (<>) {
                 $count = $count + 1;
         }
 
+        if ($line =~ /([0-9\.]+)\] async_waiting @ ([0-9]+)/) {
+                my $pid = $2;
+                my $func;
+                if (!defined($pidctr{$pid})) {
+                        $func = "wait_" . $pid . "_1";
+                        $pidctr{$pid} = 1;
+                } else {
+                        $pidctr{$pid} = $pidctr{$pid} + 1;
+                        $func = "wait_" . $pid . "_" . $pidctr{$pid};
+                }
+                if ($done == 0) {
+                        $start{$func} = $1;
+                        $type{$func} = 1;
+                        if ($1 < $firsttime) {
+                                $firsttime = $1;
+                        }
+                }
+                $pids{$func} = $pid;
+                $count = $count + 1;
+        }
+
         if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z0-9\_]+)\+.*returned/) {
                 if ($done == 0) {
                         $end{$2} = $1;
                         $maxtime = $1;
                 }
         }
+
+        if ($line =~ /([0-9\.]+)\] async_continuing @ ([0-9]+)/) {
+                my $pid = $2;
+                my $func =  "wait_" . $pid . "_" . $pidctr{$pid};
+                $end{$func} = $1;
+                $maxtime = $1;
+        }
         if ($line =~ /Write protecting the/) {
                 $done = 1;
         }
@@ -88,7 +119,7 @@ END
 }
 
 print "<?xml version=\"1.0\" standalone=\"no\"?> \n";
-print "<svg width=\"1000\" height=\"100%\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\">\n";
+print "<svg width=\"2000\" height=\"100%\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\">\n";
 
 my @styles;
 
@@ -105,8 +136,11 @@ $styles[9] = "fill:rgb(255,255,128);fill-opacity:0.5;stroke-width:1;stroke:rgb(0
 $styles[10] = "fill:rgb(255,128,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
 $styles[11] = "fill:rgb(128,255,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
 
-my $mult = 950.0 / ($maxtime - $firsttime);
-my $threshold = ($maxtime - $firsttime) / 60.0;
+my $style_wait = "fill:rgb(128,128,128);fill-opacity:0.5;stroke-width:0;stroke:rgb(0,0,0)";
+
+my $mult = 1950.0 / ($maxtime - $firsttime);
+my $threshold2 = ($maxtime - $firsttime) / 120.0;
+my $threshold = $threshold2/10;
 my $stylecounter = 0;
 my %rows;
 my $rowscount = 1;
@@ -116,7 +150,7 @@ foreach my $key (@initcalls) {
         my $duration = $end{$key} - $start{$key};
 
         if ($duration >= $threshold) {
-                my ($s, $s2, $e, $w, $y, $y2, $style);
+                my ($s, $s2, $s3, $e, $w, $y, $y2, $style);
                 my $pid = $pids{$key};
 
                 if (!defined($rows{$pid})) {
@@ -125,6 +159,7 @@ foreach my $key (@initcalls) {
                 }
                 $s = ($start{$key} - $firsttime) * $mult;
                 $s2 = $s + 6;
+                $s3 = $s + 1;
                 $e = ($end{$key} - $firsttime) * $mult;
                 $w = $e - $s;
 
@@ -137,8 +172,17 @@ foreach my $key (@initcalls) {
                         $stylecounter = 0;
                 };
 
-                print "<rect x=\"$s\" width=\"$w\" y=\"$y\" height=\"145\" style=\"$style\"/>\n";
-                print "<text transform=\"translate($s2,$y2) rotate(90)\">$key</text>\n";
+                if ($type{$key} == 1) {
+                        $y = $y + 15;
+                        print "<rect x=\"$s\" width=\"$w\" y=\"$y\" height=\"115\" style=\"$style_wait\"/>\n";
+                } else {
+                        print "<rect x=\"$s\" width=\"$w\" y=\"$y\" height=\"145\" style=\"$style\"/>\n";
+                        if ($duration >= $threshold2) {
+                                print "<text transform=\"translate($s2,$y2) rotate(90)\">$key</text>\n";
+                        } else {
+                                print "<text transform=\"translate($s3,$y2) rotate(90)\" font-size=\"3pt\">$key</text>\n";
+                        }
+                }
         }
 }