commit debf01a78c2bc560e2f299449c8bcd21b1886a3d
author Carl Shapiro <cshapiro@google.com> Mon Jun 28 23:05:54 2010 -0700
committer Carl Shapiro <cshapiro@google.com> Mon Jun 28 23:05:54 2010 -0700
tree 76a18be978373946558538c6ec4124e101790aff
parent 9e59477ceac80df2e00ee4a387df31c7c5e8d05f

Remove code superseded by the pre- and post-verify switches.

Change-Id: Iacd45b8b0f64a4e215011b865f57df75c4a08981

vm/alloc/Heap.c

diff --git a/vm/alloc/Heap.c b/vm/alloc/Heap.c
index ecd7cc8..80b5030 100644
--- a/vm/alloc/Heap.c
+++ b/vm/alloc/Heap.c
@@ -581,26 +581,6 @@
 }
 
 /*
- * Suspend the VM as for a GC, and assert-fail if any object has any
- * corrupt references.
- */
-void dvmHeapSuspendAndVerify()
-{
-    /* Suspend the VM. */
-    dvmSuspendAllThreads(SUSPEND_FOR_VERIFY);
-    dvmLockMutex(&gDvm.heapWorkerLock);
-    dvmAssertHeapWorkerThreadRunning();
-    dvmLockMutex(&gDvm.heapWorkerListLock);
-
-    verifyHeap();
-
-    /* Resume the VM. */
-    dvmUnlockMutex(&gDvm.heapWorkerListLock);
-    dvmUnlockMutex(&gDvm.heapWorkerLock);
-    dvmResumeAllThreads(SUSPEND_FOR_VERIFY);
-}
-
-/*
  * Initiate garbage collection.
  *
  * NOTES:

vm/alloc/Heap.h

diff --git a/vm/alloc/Heap.h b/vm/alloc/Heap.h
index aeaab2b..95740c1 100644
--- a/vm/alloc/Heap.h
+++ b/vm/alloc/Heap.h
@@ -79,12 +79,6 @@
 } GcReason;
 
 /*
- * Suspend the VM as for a GC, and assert-fail if any object has any
- * corrupt references.
- */
-void dvmHeapSuspendAndVerify();
-
-/*
  * Run the garbage collector without doing any locking.
  */
 void dvmCollectGarbageInternal(bool clearSoftRefs, GcReason reason);