|
From: <sv...@va...> - 2006-12-26 03:51:51
|
Author: sewardj
Date: 2006-12-26 03:51:46 +0000 (Tue, 26 Dec 2006)
New Revision: 6429
Log:
Merge r6382/3 (Fix confusing leak-checker flag hints, and regtest updates=
)
Modified:
branches/VALGRIND_3_2_BRANCH/memcheck/mc_leakcheck.c
branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-0.stderr.exp
branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-0.stderr.exp2
branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-cycle.stderr.exp64
branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-regroot.stderr.exp
branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-regroot.stderr.exp2
branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-tree.stderr.exp
branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-tree.stderr.exp2
branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-tree.stderr.exp64
branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stderr.exp
branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stderr.exp2
branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stderr.exp3
branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stderr.exp64
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/mc_leakcheck.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/mc_leakcheck.c 2006-12-26 03:17=
:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/mc_leakcheck.c 2006-12-26 03:51=
:46 UTC (rev 6429)
@@ -928,14 +928,17 @@
MC_(bytes_reachable), blocks_reachable );
VG_(message)(Vg_UserMsg, " suppressed: %,lu bytes in %,lu b=
locks.",
MC_(bytes_suppressed), blocks_suppressed =
);
- if (mode =3D=3D LC_Summary && blocks_leaked > 0)
- VG_(message)(Vg_UserMsg,
- "Use --leak-check=3Dfull to see details of leaked memory.");
- else if (!MC_(clo_show_reachable)) {
+ if (mode =3D=3D LC_Summary=20
+ && (blocks_leaked + blocks_indirect=20
+ + blocks_dubious + blocks_reachable) > 0) {
+ VG_(message)(Vg_UserMsg,
+ "Rerun with --leak-check=3Dfull to see details of =
leaked memory.");
+ }
+ if (blocks_reachable > 0 && !MC_(clo_show_reachable) && mode =3D=3D=
LC_Full) {
VG_(message)(Vg_UserMsg,=20
"Reachable blocks (those to which a pointer was found) are no=
t shown.");
VG_(message)(Vg_UserMsg,=20
- "To see them, rerun with: --show-reachable=3Dyes");
+ "To see them, rerun with: --leak-check=3Dfull --show-reachab=
le=3Dyes");
}
}
=20
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-0.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-0.stderr.exp 2006-12=
-26 03:17:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-0.stderr.exp 2006-12=
-26 03:51:46 UTC (rev 6429)
@@ -8,7 +8,7 @@
still reachable: 0 bytes in 1 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
=20
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-0.stderr.exp2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-0.stderr.exp2 2006-1=
2-26 03:17:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-0.stderr.exp2 2006-1=
2-26 03:51:46 UTC (rev 6429)
@@ -9,7 +9,7 @@
still reachable: 24 bytes in 2 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
=20
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-cycle.stderr.e=
xp64
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-cycle.stderr.exp64 2=
006-12-26 03:17:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-cycle.stderr.exp64 2=
006-12-26 03:51:46 UTC (rev 6429)
@@ -35,8 +35,6 @@
possibly lost: 0 bytes in 0 blocks.
still reachable: 0 bytes in 0 blocks.
suppressed: 0 bytes in 0 blocks.
-Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
=20
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 288 bytes in 18 blocks.
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-regroot.stderr=
.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-regroot.stderr.exp 2=
006-12-26 03:17:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-regroot.stderr.exp 2=
006-12-26 03:51:46 UTC (rev 6429)
@@ -8,7 +8,7 @@
still reachable: 10 bytes in 1 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
=20
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-regroot.stderr=
.exp2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-regroot.stderr.exp2 =
2006-12-26 03:17:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-regroot.stderr.exp2 =
2006-12-26 03:51:46 UTC (rev 6429)
@@ -9,7 +9,7 @@
still reachable: 34 bytes in 2 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
=20
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-tree.stderr.ex=
p
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-tree.stderr.exp 2006=
-12-26 03:17:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-tree.stderr.exp 2006=
-12-26 03:51:46 UTC (rev 6429)
@@ -14,7 +14,7 @@
still reachable: 16 bytes in 2 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
searching for pointers to 14 not-freed blocks.
checked ... bytes.
=20
@@ -43,7 +43,7 @@
still reachable: 0 bytes in 0 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
=20
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 112 bytes in 14 blocks.
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-tree.stderr.ex=
p2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-tree.stderr.exp2 200=
6-12-26 03:17:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-tree.stderr.exp2 200=
6-12-26 03:51:46 UTC (rev 6429)
@@ -13,7 +13,7 @@
still reachable: 80 bytes in 10 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
searching for pointers to 14 not-freed blocks.
checked ... bytes.
=20
@@ -42,7 +42,7 @@
still reachable: 56 bytes in 7 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
=20
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 112 bytes in 14 blocks.
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-tree.stderr.ex=
p64
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-tree.stderr.exp64 20=
06-12-26 03:17:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/tests/leak-tree.stderr.exp64 20=
06-12-26 03:51:46 UTC (rev 6429)
@@ -14,7 +14,7 @@
still reachable: 96 bytes in 6 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
searching for pointers to 14 not-freed blocks.
checked ... bytes.
=20
@@ -43,7 +43,7 @@
still reachable: 112 bytes in 7 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
=20
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 224 bytes in 14 blocks.
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stder=
r.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stderr.exp =
2006-12-26 03:17:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stderr.exp =
2006-12-26 03:51:46 UTC (rev 6429)
@@ -8,7 +8,7 @@
still reachable: 1,048,576 bytes in 1 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
=20
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 1,048,576 bytes in 1 blocks.
@@ -26,5 +26,3 @@
possibly lost: 0 bytes in 0 blocks.
still reachable: 0 bytes in 0 blocks.
suppressed: 0 bytes in 0 blocks.
-Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stder=
r.exp2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stderr.exp2=
2006-12-26 03:17:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stderr.exp2=
2006-12-26 03:51:46 UTC (rev 6429)
@@ -9,7 +9,7 @@
still reachable: 1,048,600 bytes in 2 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
=20
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 1,048,576 bytes in 1 blocks.
@@ -29,4 +29,4 @@
still reachable: 0 bytes in 0 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stder=
r.exp3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stderr.exp3=
2006-12-26 03:17:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stderr.exp3=
2006-12-26 03:51:46 UTC (rev 6429)
@@ -8,7 +8,7 @@
still reachable: 1,048,576 bytes in 1 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
=20
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 1,048,576 bytes in 1 blocks.
@@ -27,4 +27,4 @@
still reachable: 0 bytes in 0 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stder=
r.exp64
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stderr.exp6=
4 2006-12-26 03:17:44 UTC (rev 6428)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/tests/pointer-trace.stderr.exp6=
4 2006-12-26 03:51:46 UTC (rev 6429)
@@ -8,7 +8,7 @@
still reachable: 2,097,152 bytes in 1 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
=20
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 2,097,152 bytes in 1 blocks.
@@ -27,4 +27,4 @@
still reachable: 0 bytes in 0 blocks.
suppressed: 0 bytes in 0 blocks.
Reachable blocks (those to which a pointer was found) are not shown.
-To see them, rerun with: --show-reachable=3Dyes
+To see them, rerun with: --leak-check=3Dfull --show-reachable=3Dyes
|