equal
deleted
inserted
replaced
3192 } |
3192 } |
3193 |
3193 |
3194 oop JavaThread::current_park_blocker() { |
3194 oop JavaThread::current_park_blocker() { |
3195 // Support for JSR-166 locks |
3195 // Support for JSR-166 locks |
3196 oop thread_oop = threadObj(); |
3196 oop thread_oop = threadObj(); |
3197 if (thread_oop != NULL && |
3197 if (thread_oop != NULL) { |
3198 JDK_Version::current().supports_thread_park_blocker()) { |
|
3199 return java_lang_Thread::park_blocker(thread_oop); |
3198 return java_lang_Thread::park_blocker(thread_oop); |
3200 } |
3199 } |
3201 return NULL; |
3200 return NULL; |
3202 } |
3201 } |
3203 |
3202 |
4009 |
4008 |
4010 #if INCLUDE_RTM_OPT |
4009 #if INCLUDE_RTM_OPT |
4011 RTMLockingCounters::init(); |
4010 RTMLockingCounters::init(); |
4012 #endif |
4011 #endif |
4013 |
4012 |
4014 if (JDK_Version::current().post_vm_init_hook_enabled()) { |
4013 call_postVMInitHook(THREAD); |
4015 call_postVMInitHook(THREAD); |
4014 // The Java side of PostVMInitHook.run must deal with all |
4016 // The Java side of PostVMInitHook.run must deal with all |
4015 // exceptions and provide means of diagnosis. |
4017 // exceptions and provide means of diagnosis. |
4016 if (HAS_PENDING_EXCEPTION) { |
4018 if (HAS_PENDING_EXCEPTION) { |
4017 CLEAR_PENDING_EXCEPTION; |
4019 CLEAR_PENDING_EXCEPTION; |
|
4020 } |
|
4021 } |
4018 } |
4022 |
4019 |
4023 { |
4020 { |
4024 MutexLocker ml(PeriodicTask_lock); |
4021 MutexLocker ml(PeriodicTask_lock); |
4025 // Make sure the WatcherThread can be started by WatcherThread::start() |
4022 // Make sure the WatcherThread can be started by WatcherThread::start() |