Remove remaining profiling gunk from Memcheck.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5387

diff --git a/memcheck/mac_leakcheck.c b/memcheck/mac_leakcheck.c
index f6fae085598e778a714b60b1f78fea7fc9723192..7747dad92ecd8dc65503b01c4c0fa6eb774f5c5c 100644 (file)
--- a/memcheck/mac_leakcheck.c
+++ b/memcheck/mac_leakcheck.c
@@ -42,7 +42,6 @@
 #include "pub_tool_machine.h"
 #include "pub_tool_mallocfree.h"
 #include "pub_tool_options.h"
-#include "pub_tool_profile.h"       // For mac_shared.h
 #include "pub_tool_signals.h"
 
 #include "mac_shared.h"

diff --git a/memcheck/mac_malloc_wrappers.c b/memcheck/mac_malloc_wrappers.c
index 727a303ae392d4bda130d3e470a0038684336289..523dcf082d65e181c9119c6d324733b60fd13aea 100644 (file)
--- a/memcheck/mac_malloc_wrappers.c
+++ b/memcheck/mac_malloc_wrappers.c
@@ -39,7 +39,6 @@
 #include "pub_tool_libcprint.h"
 #include "pub_tool_mallocfree.h"
 #include "pub_tool_options.h"
-#include "pub_tool_profile.h"       // For mac_shared.h
 #include "pub_tool_replacemalloc.h"
 #include "pub_tool_threadstate.h"
 #include "mac_shared.h"

diff --git a/memcheck/mac_replace_strmem.c b/memcheck/mac_replace_strmem.c
index 16301ff9f04f4d70f9391f91541584d9b1a7c8d3..aae64cc012056042f1a01e2d4da1446ce16d6fce 100644 (file)
--- a/memcheck/mac_replace_strmem.c
+++ b/memcheck/mac_replace_strmem.c
@@ -32,7 +32,6 @@
 
 #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"

diff --git a/memcheck/mac_shared.c b/memcheck/mac_shared.c
index bd303be2d22364cd21cb6f685a6769ae0e2ba7cb..592ac7987dbc4fd8c394921a1097d7aecd1cc377 100644 (file)
--- a/memcheck/mac_shared.c
+++ b/memcheck/mac_shared.c
@@ -40,7 +40,6 @@
 #include "pub_tool_mallocfree.h"
 #include "pub_tool_machine.h"
 #include "pub_tool_options.h"
-#include "pub_tool_profile.h"       // For mac_shared.h
 #include "pub_tool_replacemalloc.h"
 #include "pub_tool_threadstate.h"
 #include "mac_shared.h"

diff --git a/memcheck/mac_shared.h b/memcheck/mac_shared.h
index b62fbc5d82cc016d88978eeb49136744bc48ec37..bc080d9019bba8e66d9d1dad2a7ff8e7904e4063 100644 (file)
--- a/memcheck/mac_shared.h
+++ b/memcheck/mac_shared.h
@@ -157,17 +157,9 @@ typedef
 
 
 /*------------------------------------------------------------*/
-/*--- Profiling of tools and memory events                 ---*/
+/*--- Profiling of memory events                           ---*/
 /*------------------------------------------------------------*/
 
-typedef 
-   enum { 
-      VgpCheckMem = VgpFini+1,
-      VgpSetMem,
-      VgpESPAdj
-   } 
-   VgpToolCC;
-
 /* Define to collect detailed performance info. */
 /* #define MAC_PROFILE_MEMORY */
 

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 4a845a2f1a99ee5a3bfa7cc8d4e334877cef5a14..4dbcf0b2f7d862e1500b2bac7fc1a994e96fd722 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -47,7 +47,6 @@
 #include "pub_tool_machine.h"
 #include "pub_tool_mallocfree.h"
 #include "pub_tool_options.h"
-#include "pub_tool_profile.h"       // For mac_shared.h
 #include "pub_tool_replacemalloc.h"
 #include "pub_tool_tooliface.h"
 #include "pub_tool_threadstate.h"
@@ -2671,10 +2670,6 @@ static void mc_pre_clo_init(void)
    VG_(track_post_reg_write)                  ( & mc_post_reg_write );
    VG_(track_post_reg_write_clientcall_return)( & mc_post_reg_write_clientcall );
 
-   VG_(register_profile_event) ( VgpSetMem,   "set-mem-perms" );
-   VG_(register_profile_event) ( VgpCheckMem, "check-mem-perms" );
-   VG_(register_profile_event) ( VgpESPAdj,   "adjust-ESP" );
-
    /* Additional block description for VG_(describe_addr)() */
    MAC_(describe_addr_supp) = client_perm_maybe_describe;
 

diff --git a/memcheck/mc_translate.c b/memcheck/mc_translate.c
index fbe6d6d2806955dc7650074e78481cca9fe2c3d4..520459b8a139ebf344f789936c6536f701ad1ffe 100644 (file)
--- a/memcheck/mc_translate.c
+++ b/memcheck/mc_translate.c
@@ -33,7 +33,6 @@
 #include "pub_tool_hashtable.h"     // For mac_shared.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"