Author: njn
Date: 2007-11-10 04:18:39 +0000 (Sat, 10 Nov 2007)
New Revision: 7134
Log:
Filter out some of Massif's verbose output that varies from machine to
machine, caused by them getting slightly different stack traces.
Modified:
trunk/massif/ms_main.c
trunk/massif/tests/culling1.stderr.exp
trunk/massif/tests/culling2.stderr.exp
trunk/massif/tests/deep-B.stderr.exp
trunk/massif/tests/deep-C.stderr.exp
trunk/massif/tests/filter_verbose
trunk/massif/tests/peak2.stderr.exp
trunk/massif/tests/realloc.stderr.exp
Modified: trunk/massif/ms_main.c
===================================================================
--- trunk/massif/ms_main.c 2007-11-10 04:08:08 UTC (rev 7133)
+++ trunk/massif/ms_main.c 2007-11-10 04:18:39 UTC (rev 7134)
@@ -2037,8 +2037,8 @@
VERB(1, "top-XPts: %u (%d%%)",
alloc_xpt->n_children,
( n_xpts ? alloc_xpt->n_children * 100 / n_xpts : 0));
- VERB(1, "XPt-init-expansions: %u", n_xpt_init_expansions);
- VERB(1, "XPt-later-expansions: %u", n_xpt_later_expansions);
+ VERB(1, "XPt init expansions: %u", n_xpt_init_expansions);
+ VERB(1, "XPt later expansions: %u", n_xpt_later_expansions);
VERB(1, "SXPt allocs: %u", n_sxpt_allocs);
VERB(1, "SXPt frees: %u", n_sxpt_frees);
VERB(1, "skipped snapshots: %u", n_skipped_snapshots);
@@ -2046,7 +2046,7 @@
VERB(1, "detailed snapshots: %u", n_detailed_snapshots);
VERB(1, "peak snapshots: %u", n_peak_snapshots);
VERB(1, "cullings: %u", n_cullings);
- VERB(1, "XCon_redos: %u", n_XCon_redos);
+ VERB(1, "XCon redos: %u", n_XCon_redos);
}
Modified: trunk/massif/tests/culling1.stderr.exp
===================================================================
--- trunk/massif/tests/culling1.stderr.exp 2007-11-10 04:08:08 UTC (rev
7133)
+++ trunk/massif/tests/culling1.stderr.exp 2007-11-10 04:18:39 UTC (rev
7134)
@@ -424,15 +424,15 @@
Massif: heap frees: 0
Massif: stack allocs: 0
Massif: stack frees: 0
-Massif: XPts: 4
-Massif: top-XPts: 1 (25%)
-Massif: XPt-init-expansions: 3
-Massif: XPt-later-expansions: 0
-Massif: SXPt allocs: 60
-Massif: SXPt frees: 36
+Massif: XPts: ...
+Massif: top-XPts: ...
+Massif: XPt init expansions: 3
+Massif: XPt later expansions: 0
+Massif: SXPt allocs: ...
+Massif: SXPt frees: ...
Massif: skipped snapshots: 51
Massif: real snapshots: 150
Massif: detailed snapshots: 15
Massif: peak snapshots: 0
Massif: cullings: 2
-Massif: XCon_redos: 0
+Massif: XCon redos: ...
Modified: trunk/massif/tests/culling2.stderr.exp
===================================================================
--- trunk/massif/tests/culling2.stderr.exp 2007-11-10 04:08:08 UTC (rev
7133)
+++ trunk/massif/tests/culling2.stderr.exp 2007-11-10 04:18:39 UTC (rev
7134)
@@ -527,15 +527,15 @@
Massif: heap frees: 0
Massif: stack allocs: 0
Massif: stack frees: 0
-Massif: XPts: 4
-Massif: top-XPts: 1 (25%)
-Massif: XPt-init-expansions: 3
-Massif: XPt-later-expansions: 0
-Massif: SXPt allocs: 80
-Massif: SXPt frees: 76
+Massif: XPts: ...
+Massif: top-XPts: ...
+Massif: XPt init expansions: 3
+Massif: XPt later expansions: 0
+Massif: SXPt allocs: ...
+Massif: SXPt frees: ...
Massif: skipped snapshots: 1
Massif: real snapshots: 200
Massif: detailed snapshots: 20
Massif: peak snapshots: 0
Massif: cullings: 3
-Massif: XCon_redos: 0
+Massif: XCon redos: ...
Modified: trunk/massif/tests/deep-B.stderr.exp
===================================================================
--- trunk/massif/tests/deep-B.stderr.exp 2007-11-10 04:08:08 UTC (rev
7133)
+++ trunk/massif/tests/deep-B.stderr.exp 2007-11-10 04:18:39 UTC (rev
7134)
@@ -36,15 +36,15 @@
Massif: heap frees: 0
Massif: stack allocs: 0
Massif: stack frees: 0
-Massif: XPts: 9
-Massif: top-XPts: 1 (11%)
-Massif: XPt-init-expansions: 8
-Massif: XPt-later-expansions: 0
-Massif: SXPt allocs: 9
-Massif: SXPt frees: 0
+Massif: XPts: ...
+Massif: top-XPts: ...
+Massif: XPt init expansions: 8
+Massif: XPt later expansions: 0
+Massif: SXPt allocs: ...
+Massif: SXPt frees: ...
Massif: skipped snapshots: 0
Massif: real snapshots: 11
Massif: detailed snapshots: 1
Massif: peak snapshots: 0
Massif: cullings: 0
-Massif: XCon_redos: 10
+Massif: XCon redos: ...
Modified: trunk/massif/tests/deep-C.stderr.exp
===================================================================
--- trunk/massif/tests/deep-C.stderr.exp 2007-11-10 04:08:08 UTC (rev
7133)
+++ trunk/massif/tests/deep-C.stderr.exp 2007-11-10 04:18:39 UTC (rev
7134)
@@ -39,15 +39,15 @@
Massif: heap frees: 0
Massif: stack allocs: 0
Massif: stack frees: 0
-Massif: XPts: 6
-Massif: top-XPts: 1 (16%)
-Massif: XPt-init-expansions: 5
-Massif: XPt-later-expansions: 0
-Massif: SXPt allocs: 6
-Massif: SXPt frees: 0
+Massif: XPts: ...
+Massif: top-XPts: ...
+Massif: XPt init expansions: 5
+Massif: XPt later expansions: 0
+Massif: SXPt allocs: ...
+Massif: SXPt frees: ...
Massif: skipped snapshots: 0
Massif: real snapshots: 11
Massif: detailed snapshots: 1
Massif: peak snapshots: 0
Massif: cullings: 0
-Massif: XCon_redos: 10
+Massif: XCon redos: ...
Modified: trunk/massif/tests/filter_verbose
===================================================================
--- trunk/massif/tests/filter_verbose 2007-11-10 04:08:08 UTC (rev 7133)
+++ trunk/massif/tests/filter_verbose 2007-11-10 04:18:39 UTC (rev 7134)
@@ -9,4 +9,15 @@
# Only print lines that contain "Massif:". The -n means don't print any
# lines by default, and the 'p' means do print those that match the pattern.
-sed -n "/Massif:/p"
+sed -n "/Massif:/p" |
+
+# These XPt counts vary from machine to machine, because the size of the
+# stack trace can vary -- eg. some machines have more stack frames below
+# zero than other machines. So filter them out.
+sed "s/\(Massif: XPts:\).*/\1 .../" |
+sed "s/\(Massif: top-XPts:\).*/\1 .../" |
+sed "s/\(Massif: XPt-init-expansions:\).*/\1 .../" |
+sed "s/\(Massif: XPt-later-expansions:\).*/\1 .../" |
+sed "s/\(Massif: SXPt allocs:\).*/\1 .../" |
+sed "s/\(Massif: SXPt frees:\).*/\1 .../" |
+sed "s/\(Massif: XCon redos:\).*/\1 .../"
Modified: trunk/massif/tests/peak2.stderr.exp
===================================================================
--- trunk/massif/tests/peak2.stderr.exp 2007-11-10 04:08:08 UTC (rev 7133)
+++ trunk/massif/tests/peak2.stderr.exp 2007-11-10 04:18:39 UTC (rev 7134)
@@ -94,15 +94,15 @@
Massif: heap frees: 20
Massif: stack allocs: 0
Massif: stack frees: 0
-Massif: XPts: 7
-Massif: top-XPts: 2 (28%)
-Massif: XPt-init-expansions: 5
-Massif: XPt-later-expansions: 0
-Massif: SXPt allocs: 75
-Massif: SXPt frees: 0
+Massif: XPts: ...
+Massif: top-XPts: ...
+Massif: XPt init expansions: 5
+Massif: XPt later expansions: 0
+Massif: SXPt allocs: ...
+Massif: SXPt frees: ...
Massif: skipped snapshots: 0
Massif: real snapshots: 76
Massif: detailed snapshots: 15
Massif: peak snapshots: 15
Massif: cullings: 0
-Massif: XCon_redos: 0
+Massif: XCon redos: ...
Modified: trunk/massif/tests/realloc.stderr.exp
===================================================================
--- trunk/massif/tests/realloc.stderr.exp 2007-11-10 04:08:08 UTC (rev
7133)
+++ trunk/massif/tests/realloc.stderr.exp 2007-11-10 04:18:39 UTC (rev
7134)
@@ -26,15 +26,15 @@
Massif: heap frees: 1
Massif: stack allocs: 0
Massif: stack frees: 0
-Massif: XPts: 13
-Massif: top-XPts: 4 (30%)
-Massif: XPt-init-expansions: 9
-Massif: XPt-later-expansions: 0
-Massif: SXPt allocs: 20
-Massif: SXPt frees: 0
+Massif: XPts: ...
+Massif: top-XPts: ...
+Massif: XPt init expansions: 9
+Massif: XPt later expansions: 0
+Massif: SXPt allocs: ...
+Massif: SXPt frees: ...
Massif: skipped snapshots: 0
Massif: real snapshots: 8
Massif: detailed snapshots: 2
Massif: peak snapshots: 2
Massif: cullings: 0
-Massif: XCon_redos: 0
+Massif: XCon redos: ...
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Valgrind-developers mailing list
Valgrind-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/valgrind-developers
