X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fleak_finder.pl;h=c230e590d4b716f3977be7a6c5643dec44c38a54;hb=562291f6bd60cbb7482727c26bcdb746e6e964c0;hp=5219996d2515113fd7e61796fc32ccad0849a57b;hpb=c5050e412572b00cbe93d8517d2d1f767bebfa92;p=fs%2Flustre-release.git

diff --git a/lustre/tests/leak_finder.pl b/lustre/tests/leak_finder.pl
index 5219996..c230e59 100644
--- a/lustre/tests/leak_finder.pl
+++ b/lustre/tests/leak_finder.pl
@@ -11,10 +11,48 @@ my $debug_line = 0;
 my $total = 0;
 my $max = 0;
 
-while ($line = <>) {
+my @parsed;
+my %cpu;
+my $start_time = 0;
+
+if (!defined($ARGV[0])) {
+        print "No log file specified\n";
+        exit
+}
+
+open(INFILE, $ARGV[0]);
+while ($line = <INFILE>) {
+    if ($line =~ m/^(.*)\((.*):(\d+):(.*)\(\)\)/) {
+        @parsed = split(":", $1);
+        if (substr ($parsed[2], -1, 1) eq "F") {
+            chop $parsed[2];
+            $cpu{$parsed[2]} = 0;
+        } else {
+            if (!defined($cpu{$parsed[2]})) {
+                $cpu{$parsed[2]} = $parsed[3];
+            }
+        }
+    }
+}
+
+foreach $time (values %cpu) {
+    if ($start_time < $time) {
+        $start_time = $time;
+    }
+}
+
+print "Starting analysis since $start_time\n";
+
+seek(INFILE, 0, 0);
+while ($line = <INFILE>) {
     $debug_line++;
     my ($file, $func, $lno, $name, $size, $addr, $type);
-    if ($line =~ m/^.*(\.).*\((.*):(\d+):(.*)\(\)\) (k|v|slab-)(.*) '(.*)': (\d+) at (.*) \(tot (.*)\).*$/){
+    if ($line =~ m/^(.*)\((.*):(\d+):(.*)\(\)\) (k|v|slab-)(.*) '(.*)': (\d+) at ([\da-f]+)/){
+        @parsed = split(":", $1);
+        if ($parsed[3] <= $start_time) {
+                next;
+        }
+        
         $file = $2;
         $lno  = $3;
         $func = $4;
@@ -22,7 +60,6 @@ while ($line = <>) {
         $name = $7;
         $size = $8;
         $addr = $9;
-        $tot  = $10;
 
 	# we can't dump the log after portals has exited, so skip "leaks"
 	# from memory freed in the portals module unloading.
@@ -37,8 +74,8 @@ while ($line = <>) {
 
     if (index($type, 'alloced') >= 0) {
         if (defined($memory->{$addr})) {
-            print STDERR "*** Two allocs with the same address ($size bytes at $addr, $file:$func:$lno)\n";
-            print STDERR "    first malloc at $memory->{$addr}->{file}:$memory->{$addr}->{func}:$memory->{$addr}->{lno}, second at $file:$func:$lno\n";
+            print STDOUT "*** Two allocs with the same address ($size bytes at $addr, $file:$func:$lno)\n";
+            print STDOUT "    first malloc at $memory->{$addr}->{file}:$memory->{$addr}->{func}:$memory->{$addr}->{lno}, second at $file:$func:$lno\n";
             next;
         }
 
@@ -55,25 +92,22 @@ while ($line = <>) {
         }
     } else {
         if (!defined($memory->{$addr})) {
-            print STDERR "*** Free without malloc ($size bytes at $addr, $file:$func:$lno)\n";
+            print STDOUT "*** Free without malloc ($size bytes at $addr, $file:$func:$lno)\n";
             next;
         }
         my ($oldname, $oldsize, $oldfile, $oldfunc, $oldlno) = $memory->{$addr};
 
         if ($memory->{$addr}->{size} != $size) {
-            print STDERR "*** Free different size ($memory->{$addr}->{size} alloced, $size freed).\n";
-            print STDERR "    malloc at $memory->{$addr}->{file}:$memory->{$addr}->{func}:$memory->{$addr}->{lno}, free at $file:$func:$lno\n";
+            print STDOUT "*** Free different size ($memory->{$addr}->{size} alloced, $size freed).\n";
+            print STDOUT "    malloc at $memory->{$addr}->{file}:$memory->{$addr}->{func}:$memory->{$addr}->{lno}, free at $file:$func:$lno\n";
             next;
         }
 
         delete $memory->{$addr};
         $total -= $size;
     }
-    if ($total != int($tot)) {
-        print "kernel total $tot != my total $total\n";
-        $total = $tot;
-    }
 }
+close(INFILE);
 
 # Sort leak output by allocation time
 my @sorted = sort {
@@ -83,7 +117,7 @@ my @sorted = sort {
 my $key;
 foreach $key (@sorted) {
     my ($oldname, $oldsize, $oldfile, $oldfunc, $oldlno) = $memory->{$key};
-    print STDERR "*** Leak: $memory->{$key}->{size} bytes allocated at $key ($memory->{$key}->{file}:$memory->{$key}->{func}:$memory->{$key}->{lno}, debug file line $memory->{$key}->{debug_line})\n";
+    print STDOUT "*** Leak: $memory->{$key}->{size} bytes allocated at $key ($memory->{$key}->{file}:$memory->{$key}->{func}:$memory->{$key}->{lno}, debug file line $memory->{$key}->{debug_line})\n";
 }
 
-print STDERR "maximum used: $max, amount leaked: $total\n";
+print STDOUT "maximum used: $max, amount leaked: $total\n";