|
From: <sv...@va...> - 2005-12-19 22:51:46
|
Author: njn
Date: 2005-12-19 22:51:41 +0000 (Mon, 19 Dec 2005)
New Revision: 5389
Log:
Merge 5387 from trunk -- removal of remaining profiling gunk from Memchec=
k.
Modified:
branches/COMPVBITS/memcheck/mc_include.h
branches/COMPVBITS/memcheck/mc_leakcheck.c
branches/COMPVBITS/memcheck/mc_main.c
branches/COMPVBITS/memcheck/mc_malloc_wrappers.c
branches/COMPVBITS/memcheck/mc_replace_strmem.c
branches/COMPVBITS/memcheck/mc_translate.c
Modified: branches/COMPVBITS/memcheck/mc_include.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/COMPVBITS/memcheck/mc_include.h 2005-12-19 22:48:39 UTC (rev=
5388)
+++ branches/COMPVBITS/memcheck/mc_include.h 2005-12-19 22:51:41 UTC (rev=
5389)
@@ -140,17 +140,9 @@
Bool print_record );
=20
/*------------------------------------------------------------*/
-/*--- Profiling of tools and memory events ---*/
+/*--- Profiling of memory events ---*/
/*------------------------------------------------------------*/
=20
-typedef=20
- enum {=20
- VgpCheckMem =3D VgpFini+1,
- VgpSetMem,
- VgpESPAdj
- }=20
- VgpToolCC;
-
/* Define to collect detailed performance info. */
/* #define MC_PROFILE_MEMORY */
=20
Modified: branches/COMPVBITS/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/COMPVBITS/memcheck/mc_leakcheck.c 2005-12-19 22:48:39 UTC (r=
ev 5388)
+++ branches/COMPVBITS/memcheck/mc_leakcheck.c 2005-12-19 22:51:41 UTC (r=
ev 5389)
@@ -39,7 +39,6 @@
#include "pub_tool_machine.h"
#include "pub_tool_mallocfree.h"
#include "pub_tool_options.h"
-#include "pub_tool_profile.h" // For mc_include.h
#include "pub_tool_signals.h"
=20
#include "mc_include.h"
Modified: branches/COMPVBITS/memcheck/mc_main.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/COMPVBITS/memcheck/mc_main.c 2005-12-19 22:48:39 UTC (rev 53=
88)
+++ branches/COMPVBITS/memcheck/mc_main.c 2005-12-19 22:51:41 UTC (rev 53=
89)
@@ -46,7 +46,6 @@
#include "pub_tool_mallocfree.h"
#include "pub_tool_options.h"
#include "pub_tool_oset.h"
-#include "pub_tool_profile.h" // For mc_include.h
#include "pub_tool_replacemalloc.h"
#include "pub_tool_tooliface.h"
#include "pub_tool_threadstate.h"
@@ -4086,10 +4085,6 @@
VG_(track_post_reg_write) ( mc_post_reg_write );
VG_(track_post_reg_write_clientcall_return)( mc_post_reg_write_client=
call );
=20
- VG_(register_profile_event) ( VgpSetMem, "set-mem-perms" );
- VG_(register_profile_event) ( VgpCheckMem, "check-mem-perms" );
- VG_(register_profile_event) ( VgpESPAdj, "adjust-ESP" );
-
init_shadow_memory();
MC_(malloc_list) =3D VG_(HT_construct)( 80021 ); // prime, big
MC_(mempool_list) =3D VG_(HT_construct)( 1009 ); // prime, not so =
big
Modified: branches/COMPVBITS/memcheck/mc_malloc_wrappers.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/COMPVBITS/memcheck/mc_malloc_wrappers.c 2005-12-19 22:48:39 =
UTC (rev 5388)
+++ branches/COMPVBITS/memcheck/mc_malloc_wrappers.c 2005-12-19 22:51:41 =
UTC (rev 5389)
@@ -38,7 +38,6 @@
#include "pub_tool_libcprint.h"
#include "pub_tool_mallocfree.h"
#include "pub_tool_options.h"
-#include "pub_tool_profile.h" // For mc_include.h
#include "pub_tool_replacemalloc.h"
#include "pub_tool_threadstate.h"
#include "mc_include.h"
Modified: branches/COMPVBITS/memcheck/mc_replace_strmem.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/COMPVBITS/memcheck/mc_replace_strmem.c 2005-12-19 22:48:39 U=
TC (rev 5388)
+++ branches/COMPVBITS/memcheck/mc_replace_strmem.c 2005-12-19 22:51:41 U=
TC (rev 5389)
@@ -32,7 +32,6 @@
=20
#include "pub_tool_basics.h"
#include "pub_tool_hashtable.h"
-#include "pub_tool_profile.h"
#include "pub_tool_redir.h"
#include "pub_tool_tooliface.h"
#include "valgrind.h"
Modified: branches/COMPVBITS/memcheck/mc_translate.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/COMPVBITS/memcheck/mc_translate.c 2005-12-19 22:48:39 UTC (r=
ev 5388)
+++ branches/COMPVBITS/memcheck/mc_translate.c 2005-12-19 22:51:41 UTC (r=
ev 5389)
@@ -33,7 +33,6 @@
#include "pub_tool_hashtable.h" // For mc_include.h
#include "pub_tool_libcassert.h"
#include "pub_tool_libcprint.h"
-#include "pub_tool_profile.h"
#include "pub_tool_tooliface.h"
#include "mc_include.h"
=20
|