diff options
Diffstat (limited to 'vm/Thread.c')
| -rw-r--r-- | vm/Thread.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/vm/Thread.c b/vm/Thread.c index a98dbd000..54d0f4bdd 100644 --- a/vm/Thread.c +++ b/vm/Thread.c @@ -534,6 +534,7 @@ static const char* getSuspendCauseStr(SuspendCause why) case SUSPEND_FOR_DEBUG_EVENT: return "debug-event"; case SUSPEND_FOR_STACK_DUMP: return "stack-dump"; case SUSPEND_FOR_VERIFY: return "verify"; + case SUSPEND_FOR_HPROF: return "hprof"; #if defined(WITH_JIT) case SUSPEND_FOR_TBL_RESIZE: return "table-resize"; case SUSPEND_FOR_IC_PATCH: return "inline-cache-patch"; @@ -4180,17 +4181,11 @@ static void gcScanThread(Thread *thread) /* continue anyway */ } - HPROF_SET_GC_SCAN_STATE(HPROF_ROOT_THREAD_OBJECT, thread->threadId); - dvmMarkObject(thread->threadObj); // could be NULL, when constructing - HPROF_SET_GC_SCAN_STATE(HPROF_ROOT_NATIVE_STACK, thread->threadId); - dvmMarkObject(thread->exception); // usually NULL gcScanReferenceTable(&thread->internalLocalRefTable); - HPROF_SET_GC_SCAN_STATE(HPROF_ROOT_JNI_LOCAL, thread->threadId); - #ifdef USE_INDIRECT_REF gcScanIndirectRefTable(&thread->jniLocalRefTable); #else @@ -4198,16 +4193,10 @@ static void gcScanThread(Thread *thread) #endif if (thread->jniMonitorRefTable.table != NULL) { - HPROF_SET_GC_SCAN_STATE(HPROF_ROOT_JNI_MONITOR, thread->threadId); - gcScanReferenceTable(&thread->jniMonitorRefTable); } - HPROF_SET_GC_SCAN_STATE(HPROF_ROOT_JAVA_FRAME, thread->threadId); - gcScanInterpStackReferences(thread); - - HPROF_CLEAR_GC_SCAN_STATE(); } static void gcScanAllThreads() |