Remove remaining profiling gunk from Memcheck.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5387 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/mac_leakcheck.c b/memcheck/mac_leakcheck.c
index f6fae08..7747dad 100644
--- 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 727a303..523dcf0 100644
--- 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 16301ff..aae64cc 100644
--- 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 bd303be..592ac79 100644
--- 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 b62fbc5..bc080d9 100644
--- a/memcheck/mac_shared.h
+++ b/memcheck/mac_shared.h
@@ -157,17 +157,9 @@
/*------------------------------------------------------------*/
-/*--- 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 4a845a2..4dbcf0b 100644
--- 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 @@
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 fbe6d6d..520459b 100644
--- 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"