commit b874ab98306a109c4988bb1cde687a24f4f8201f
author Barry Hayes <bhayes@google.com> Wed Jul 14 08:13:18 2010 -0700
committer Barry Hayes <bhayes@google.com> Thu Jul 15 07:51:38 2010 -0700
tree a9e3c6b1b782c1abb6e8b6d062add160c51933e5
parent 5b544eb45b165336ff94c0ddfc046ba520af6db2

Make dvmCardTableStartup be more independant of HeapSource startup.

Also added a call to dvmCardTableShutdown. Also removed the dependency
on GcHeap from CardTable.h.

Change-Id: Icf0293572371cc8a30b55672816fdd75a151e82c

vm/alloc/HeapSource.c

diff --git a/vm/alloc/HeapSource.c b/vm/alloc/HeapSource.c
index bb27f31..f685fe9 100644
--- a/vm/alloc/HeapSource.c
+++ b/vm/alloc/HeapSource.c
@@ -547,10 +547,6 @@
     countAllocation(hs2heap(hs), hs, false);
 
     gHs = hs;
-    if (!dvmCardTableStartup(gcHeap, base)) {
-        LOGE_HEAP("card table allocation failed.");
-        goto fail;
-    }
     return gcHeap;
 
 fail:
@@ -621,6 +617,14 @@
 }
 
 /*
+ * Gets the begining of the allocation for the HeapSource.
+ */
+void *dvmHeapSourceGetBase(void)
+{
+    return gHs->heapBase;
+}
+
+/*
  * Returns the requested value. If the per-heap stats are requested, fill
  * them as well.
  *