Remove empty sanity check function. And clean up sanity checking in

m_scheduler a little.

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

diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c
index 09c31a6dddf13f778027632a362cd3d865a788e5..17c35ff9aa339414f0cdacc8f9a9bfc0c22e53a2 100644 (file)
--- a/coregrind/m_scheduler/scheduler.c
+++ b/coregrind/m_scheduler/scheduler.c
@@ -1092,24 +1092,14 @@ void VG_(sanity_check_general) ( Bool force_expensive )
       VGP_PUSHCC(VgpCoreExpensiveSanity);
       sanity_slow_count++;
 
-#     if 0
-      { void zzzmemscan(void); zzzmemscan(); }
-#     endif
-
-      if ((sanity_fast_count % 250) == 0)
-         VG_(sanity_check_tt_tc)("VG_(sanity_check_general)");
-
       if (VG_(needs).sanity_checks) {
           VGP_PUSHCC(VgpToolExpensiveSanity);
           vg_assert(VG_TDICT_CALL(tool_expensive_sanity_check));
           VGP_POPCC(VgpToolExpensiveSanity);
       }
 
-      /* Check that Segments and /proc/self/maps match up */
-      //vg_assert(VG_(sanity_check_memory)());
-
       /* Look for stack overruns.  Visit all threads. */
-      for(tid = 1; tid < VG_N_THREADS; tid++) {
+      for (tid = 1; tid < VG_N_THREADS; tid++) {
         SSizeT remains;
 
         if (VG_(threads)[tid].status == VgTs_Empty ||
@@ -1124,9 +1114,6 @@ void VG_(sanity_check_general) ( Bool force_expensive )
                         tid, remains);
       }
 
-      /* 
-      if ((sanity_fast_count % 500) == 0) VG_(mallocSanityCheckAll)(); 
-      */
       VGP_POPCC(VgpCoreExpensiveSanity);
    }
 

diff --git a/coregrind/m_transtab.c b/coregrind/m_transtab.c
index d004ef49322b8d3f71b7953c76c0d39b41431974..0684cd4e5be8087f0836836747d1b19d168d2910 100644 (file)
--- a/coregrind/m_transtab.c
+++ b/coregrind/m_transtab.c
@@ -577,15 +577,6 @@ void VG_(discard_translations) ( Addr64 guest_start, UInt range )
 }
 
 
-/*------------------------------------------------------------*/
-/*--- Sanity checking                                      ---*/
-/*------------------------------------------------------------*/
-
-void VG_(sanity_check_tt_tc) ( Char* who )
-{
-}
-
-
 /*------------------------------------------------------------*/
 /*--- Initialisation.                                      ---*/
 /*------------------------------------------------------------*/

diff --git a/coregrind/pub_core_transtab.h b/coregrind/pub_core_transtab.h
index 4d1f5befa4050cd5e497c3ebb5a2e29e47ab685a..bb8651008e2765dad32141daa3beff7bb609d22f 100644 (file)
--- a/coregrind/pub_core_transtab.h
+++ b/coregrind/pub_core_transtab.h
@@ -57,8 +57,6 @@ extern Bool VG_(search_transtab) ( /*OUT*/AddrH* result,
 
 extern void VG_(discard_translations) ( Addr64 start, UInt range );
 
-extern void VG_(sanity_check_tt_tc) ( Char* caller );
-
 extern void VG_(print_tt_tc_stats) ( void );
 
 extern UInt VG_(get_bbs_translated) ( void );