equal
deleted
inserted
replaced
2576 } |
2576 } |
2577 |
2577 |
2578 oop JavaThread::current_park_blocker() { |
2578 oop JavaThread::current_park_blocker() { |
2579 // Support for JSR-166 locks |
2579 // Support for JSR-166 locks |
2580 oop thread_oop = threadObj(); |
2580 oop thread_oop = threadObj(); |
2581 if (thread_oop != NULL && JDK_Version::supports_thread_park_blocker()) { |
2581 if (thread_oop != NULL && |
|
2582 JDK_Version::current().supports_thread_park_blocker()) { |
2582 return java_lang_Thread::park_blocker(thread_oop); |
2583 return java_lang_Thread::park_blocker(thread_oop); |
2583 } |
2584 } |
2584 return NULL; |
2585 return NULL; |
2585 } |
2586 } |
2586 |
2587 |
2759 // If CompilerThreads ever become non-JavaThreads, add them here |
2760 // If CompilerThreads ever become non-JavaThreads, add them here |
2760 } |
2761 } |
2761 |
2762 |
2762 jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) { |
2763 jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) { |
2763 |
2764 |
|
2765 extern void JDK_Version_init(); |
|
2766 |
2764 // Check version |
2767 // Check version |
2765 if (!is_supported_jni_version(args->version)) return JNI_EVERSION; |
2768 if (!is_supported_jni_version(args->version)) return JNI_EVERSION; |
2766 |
2769 |
2767 // Initialize the output stream module |
2770 // Initialize the output stream module |
2768 ostream_init(); |
2771 ostream_init(); |
2773 // Initialize the os module before using TLS |
2776 // Initialize the os module before using TLS |
2774 os::init(); |
2777 os::init(); |
2775 |
2778 |
2776 // Initialize system properties. |
2779 // Initialize system properties. |
2777 Arguments::init_system_properties(); |
2780 Arguments::init_system_properties(); |
|
2781 |
|
2782 // So that JDK version can be used as a discrimintor when parsing arguments |
|
2783 JDK_Version_init(); |
2778 |
2784 |
2779 // Parse arguments |
2785 // Parse arguments |
2780 jint parse_result = Arguments::parse(args); |
2786 jint parse_result = Arguments::parse(args); |
2781 if (parse_result != JNI_OK) return parse_result; |
2787 if (parse_result != JNI_OK) return parse_result; |
2782 |
2788 |