|
From: <sv...@va...> - 2006-12-06 18:06:07
|
Author: sewardj
Date: 2006-12-06 18:05:54 +0000 (Wed, 06 Dec 2006)
New Revision: 6382
Log:
Fix confusing and contradictory "Rerun with ..." messages printed at
the end of MC_(do_detect_memory_leaks). This causes various leak
regression tests to fail; will fix shortly.
Modified:
trunk/memcheck/mc_leakcheck.c
Modified: trunk/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
--- trunk/memcheck/mc_leakcheck.c 2006-12-06 17:39:16 UTC (rev 6381)
+++ trunk/memcheck/mc_leakcheck.c 2006-12-06 18:05:54 UTC (rev 6382)
@@ -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
|