scripts: improve checkstack

Stephen Hemminger · michal42 · commit 1f2a144f5ab5 · 2010-03-07T21:19:09.000+01:00
Cleanup checkstack script:
  * Turn on strict checking
  * Fix resulting error message because the declaration syntax
    was incorrect.
  * Remove incorrect and misleading use of prototype
     - prototype not required for this type of sort function
       because $a and $b are being used in this contex
     - if prototype was being used it should be for both arguments
  * Use closure for sort function

Signed-off-by: Stephen Hemminger &lt;shemminger@vyatta.com&gt;
Cc: Steven Rostedt &lt;rostedt@goodmis.org&gt;
Cc: Arjan van de Ven &lt;arjan@infradead.org&gt;
Cc: Cong Wang &lt;amwang@redhat.com&gt;
Cc: Michal Marek &lt;mmarek@suse.cz&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Michal Marek &lt;mmarek@suse.cz&gt;
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
@@ -21,6 +21,8 @@
 #
 #	TODO :	Port to all architectures (one regex per arch)
 
+use strict;
+
 # check for arch
 #
 # $re is used for two matches:
@@ -104,19 +106,11 @@
 	}
 }
 
-sub bysize($) {
-	my ($asize, $bsize);
-	($asize = $a) =~ s/.*:	*(.*)$/$1/;
-	($bsize = $b) =~ s/.*:	*(.*)$/$1/;
-	$bsize <=> $asize
-}
-
 #
 # main()
 #
 my $funcre = qr/^$x* <(.*)>:$/;
-my $func;
-my $file, $lastslash;
+my ($func, $file, $lastslash);
 
 while (my $line = <STDIN>) {
 	if ($line =~ m/$funcre/) {
@@ -173,4 +167,6 @@ ($)
 	}
 }
 
-print sort bysize @stack;
+# Sort output by size (last field)
+print sort { ($b =~ /:\t*(\d+)$/)[0] <=> ($a =~ /:\t*(\d+)$/)[0] } @stack;
+

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`#`
`22`	`22`	`# TODO : Port to all architectures (one regex per arch)`
`23`	`23`
	`24`	`+use strict;`
	`25`	`+`
`24`	`26`	`# check for arch`
`25`	`27`	`#`
`26`	`28`	`# $re is used for two matches:`
`@@ -104,19 +106,11 @@`
`104`	`106`	`}`
`105`	`107`	`}`
`106`	`108`
`107`		`-sub bysize($) {`
`108`		`- my ($asize, $bsize);`
`109`		`- ($asize = $a) =~ s/.: (.*)$/$1/;`
`110`		`- ($bsize = $b) =~ s/.: (.*)$/$1/;`
`111`		`- $bsize <=> $asize`
`112`		`-}`
`113`		`-`
`114`	`109`	`#`
`115`	`110`	`# main()`
`116`	`111`	`#`
`117`	`112`	`my $funcre = qr/^$x* <(.*)>:$/;`
`118`		`-my $func;`
`119`		`-my $file, $lastslash;`
	`113`	`+my ($func, $file, $lastslash);`
`120`	`114`
`121`	`115`	`while (my $line = <STDIN>) {`
`122`	`116`	`if ($line =~ m/$funcre/) {`
`@@ -173,4 +167,6 @@ ($)`
`173`	`167`	`}`
`174`	`168`	`}`
`175`	`169`
`176`		`-print sort bysize @stack;`
	`170`	`+# Sort output by size (last field)`
	`171`	`+print sort { ($b =~ /:\t(\d+)$/)[0] <=> ($a =~ /:\t(\d+)$/)[0] } @stack;`
	`172`	`+`