diff options
Diffstat (limited to 'vm/alloc/HeapInternal.h')
| -rw-r--r-- | vm/alloc/HeapInternal.h | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/vm/alloc/HeapInternal.h b/vm/alloc/HeapInternal.h index 7f8c9c5e3..1d1be0756 100644 --- a/vm/alloc/HeapInternal.h +++ b/vm/alloc/HeapInternal.h @@ -19,9 +19,6 @@ #ifndef _DALVIK_ALLOC_HEAP_INTERNAL #define _DALVIK_ALLOC_HEAP_INTERNAL -#include <time.h> // for struct timespec - -#include "HeapTable.h" #include "MarkSweep.h" typedef struct HeapSource HeapSource; @@ -39,34 +36,9 @@ struct GcHeap { Object *finalizerReferences; Object *phantomReferences; - /* The list of Reference objects that need to be cleared and/or - * enqueued. The bottom two bits of the object pointers indicate - * whether they should be cleared and/or enqueued. - * - * This table is protected by gDvm.heapWorkerListLock, which must - * be acquired after the heap lock. - */ - LargeHeapRefTable *referenceOperations; - - /* If non-null, the method that the HeapWorker is currently - * executing. - */ - Object *heapWorkerCurrentObject; - Method *heapWorkerCurrentMethod; - - /* If heapWorkerCurrentObject is non-null, this gives the time when - * HeapWorker started executing that method. The time value must come - * from dvmGetRelativeTimeUsec(). - * - * The "Cpu" entry tracks the per-thread CPU timer (when available). - */ - u8 heapWorkerInterpStartTime; - u8 heapWorkerInterpCpuStartTime; - - /* If any fields are non-zero, indicates the next (absolute) time that - * the HeapWorker thread should call dvmHeapSourceTrim(). + /* The list of Reference objects that need to be enqueued. */ - struct timespec heapWorkerNextTrim; + Object *clearedReferences; /* The current state of the mark step. * Only valid during a GC. |