From 400368f765c0c89f83d6299b90d54d8c54e5ae43 Mon Sep 17 00:00:00 2001
From: bwzhou <bwzhou>
Date: Mon, 28 Jan 2008 05:24:20 +0000
Subject: [PATCH] Branch b1_6 b=14413 r=shadow, johann
make leak-finder work correctly with LUSTRE and LNET debug messages
---
lustre/tests/conf-sanity.sh | 9 +++++++++
lustre/tests/leak_finder.pl | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 3bc453160f..fe81a07120 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1528,5 +1528,14 @@ test_38() { # bug 14222
run_test 38 "MDS recreates missing lov_objid file from OST data"
+test_39() { #bug 14413
+ PTLDEBUG=malloc
+ setup
+ cleanup
+ perl $SRCDIR/leak_finder.pl $TMP/debug 2>&1 | egrep "*** Leak:" && error
+}
+
+run_test 39 "leak_finder recognizes both LUSTRE and LNET malloc messages"
+
equals_msg `basename $0`: test complete
[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true
diff --git a/lustre/tests/leak_finder.pl b/lustre/tests/leak_finder.pl
index aa783bb546..45d221161b 100644
--- a/lustre/tests/leak_finder.pl
+++ b/lustre/tests/leak_finder.pl
@@ -14,7 +14,7 @@ my $max = 0;
while ($line = <>) {
$debug_line++;
my ($file, $func, $lno, $name, $size, $addr, $type);
- if ($line =~ m/^.*(\.).*\((.*):(\d+):(.*)\(\)\) (k|v|slab-)(.*) '(.*)': (\d+) at (.*)\..*$/){
+ if ($line =~ m/^.*(\.).*\((.*):(\d+):(.*)\(\)\) (k|v|slab-)(.*) '(.*)': (\d+) at ([\da-f]+)/){
$file = $2;
$lno = $3;
$func = $4;
--
GitLab