< prev index next >

src/share/vm/runtime/thread.cpp

Print this page

        

*** 32,41 **** --- 32,42 ---- #include "code/scopeDesc.hpp" #include "compiler/compileBroker.hpp" #include "compiler/compileTask.hpp" #include "gc/shared/gcId.hpp" #include "gc/shared/gcLocker.inline.hpp" + #include "gc/shared/referencePendingListLocker.hpp" #include "gc/shared/workgroup.hpp" #include "interpreter/interpreter.hpp" #include "interpreter/linkResolver.hpp" #include "interpreter/oopMapCache.hpp" #include "jvmtifiles/jvmtiEnv.hpp"
*** 3648,3669 **** // Note that we do not use CHECK_0 here since we are inside an EXCEPTION_MARK and // set_init_completed has just been called, causing exceptions not to be shortcut // anymore. We call vm_exit_during_initialization directly instead. SystemDictionary::compute_java_system_loader(CHECK_(JNI_ERR)); ! #if INCLUDE_ALL_GCS ! // Support for ConcurrentMarkSweep. This should be cleaned up ! // and better encapsulated. The ugly nested if test would go away ! // once things are properly refactored. XXX YSR ! if (UseConcMarkSweepGC || UseG1GC) { ! if (UseConcMarkSweepGC) { ! ConcurrentMarkSweepThread::makeSurrogateLockerThread(CHECK_JNI_ERR); ! } else { ! ConcurrentMarkThread::makeSurrogateLockerThread(CHECK_JNI_ERR); ! } ! } ! #endif // INCLUDE_ALL_GCS // Always call even when there are not JVMTI environments yet, since environments // may be attached late and JVMTI must track phases of VM execution JvmtiExport::enter_live_phase(); --- 3649,3661 ---- // Note that we do not use CHECK_0 here since we are inside an EXCEPTION_MARK and // set_init_completed has just been called, causing exceptions not to be shortcut // anymore. We call vm_exit_during_initialization directly instead. SystemDictionary::compute_java_system_loader(CHECK_(JNI_ERR)); ! // Initialize reference pending list locker ! bool needs_locker_thread = Universe::heap()->needs_reference_pending_list_locker_thread(); ! ReferencePendingListLocker::initialize(needs_locker_thread, CHECK_JNI_ERR); // Always call even when there are not JVMTI environments yet, since environments // may be attached late and JVMTI must track phases of VM execution JvmtiExport::enter_live_phase();
< prev index next >