truffle: src/share/vm/runtime/thread.cpp comparison

comparison src/share/vm/runtime/thread.cpp @ 14422:2b8e28fdf503

Merge

author	kvn
date	Tue, 05 Nov 2013 17:38:04 -0800
parents	e2722a66aba7 292050e5d5ea
children	abec000618bf 62c54fcc0a35

comparison

equal deleted inserted replaced

-:3068270ba476
+:2b8e28fdf503
 Thread::~Thread() {
 // Reclaim the objectmonitors from the omFreeList of the moribund thread.
 ObjectSynchronizer::omFlush (this) ;
+EVENT_THREAD_DESTRUCT(this);
 // stack_base can be NULL if the thread is never started or exited before
 // record_stack_base_and_size called. Although, we would like to ensure
 // that all started threads do call record_stack_base_and_size(), there is
 // not proper way to enforce that.
 #if INCLUDE_NMT
 }
 // General purpose hook into Java code, run once when the VM is initialized.
 // The Java library method itself may be changed independently from the VM.
 static void call_postVMInitHook(TRAPS) {
-Klass* k = SystemDictionary::PostVMInitHook_klass();
+Klass* k = SystemDictionary::resolve_or_null(vmSymbols::sun_misc_PostVMInitHook(), THREAD);
 instanceKlassHandle klass (THREAD, k);
 if (klass.not_null()) {
 JavaValue result(T_VOID);
 JavaCalls::call_static(&result, klass, vmSymbols::run_method_name(),
 vmSymbols::void_method_signature(),
 _array_for_gc = NULL;
 _suspend_equivalent = false;
 _in_deopt_handler = 0;
 _doing_unsafe_access = false;
 _stack_guard_state = stack_guard_unused;
-_exception_oop = NULL;
+(void)const_cast<oop&>(_exception_oop = NULL);
 _exception_pc  = 0;
 _exception_handler_pc = 0;
 _is_method_handle_return = 0;
 _jvmti_thread_state= NULL;
 _should_post_on_exceptions_flag = JNI_FALSE;
 _jvmti_get_loaded_classes_closure = NULL;
 _interp_only_mode    = 0;
 _special_runtime_exit_condition = _no_async_condition;
 _pending_async_exception = NULL;
-_is_compiling = false;
 _thread_stat = NULL;
 _thread_stat = new ThreadStatistics();
 _blocked_on_compilation = false;
 _jni_active_critical = 0;
 _do_not_unlock_if_synchronized = false;
 EVENT_THREAD_EXIT(this);
 // Call Thread.exit(). We try 3 times in case we got another Thread.stop during
 // the execution of the method. If that is not enough, then we don't really care. Thread.stop
 // is deprecated anyhow.
-{ int count = 3;
+if (!is_Compiler_thread()) {
+int count = 3;
 while (java_lang_Thread::threadGroup(threadObj()) != NULL && (count-- > 0)) {
 EXCEPTION_MARK;
 JavaValue result(T_VOID);
 KlassHandle thread_klass(THREAD, SystemDictionary::Thread_klass());
 JavaCalls::call_virtual(&result,
 vmSymbols::void_method_signature(),
 THREAD);
 CLEAR_PENDING_EXCEPTION;
 }
 }
 // notify JVMTI
 if (JvmtiExport::should_post_thread_life()) {
 JvmtiExport::post_thread_end(this);
 }
 _task  = NULL;
 _queue = queue;
 _counters = counters;
 _buffer_blob = NULL;
 _scanned_nmethod = NULL;
+_compiler = NULL;
 #ifndef PRODUCT
 _ideal_graph_printer = NULL;
 #endif
 }
 // process it here to make sure it isn't unloaded in the middle of
 // a scan.
 cf->do_code_blob(_scanned_nmethod);
 }
 }
 // ======= Threads ========
 // The Threads class links together all active threads, and provides
 // operations over all threads.  It is protected by its own Mutex
 bool        Threads::_vm_complete = false;
 #endif
 // All JavaThreads
 #define ALL_JAVA_THREADS(X) for (JavaThread* X = _thread_list; X; X = X->next())
-void os_stream();
 // All JavaThreads + all non-JavaThreads (i.e., every thread in the system)
 void Threads::threads_do(ThreadClosure* tc) {
 assert_locked_or_safepoint(Threads_lock);
 // ALL_JAVA_THREADS iterates through all JavaThreads
 Arguments::init_version_specific_system_properties();
 // Parse arguments
 jint parse_result = Arguments::parse(args);
 if (parse_result != JNI_OK) return parse_result;
+os::init_before_ergo();
+jint ergo_result = Arguments::apply_ergo();
+if (ergo_result != JNI_OK) return ergo_result;
 if (PauseAtStartup) {
 os::pause();
 }
 // initialize compiler(s)
 #if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK)
 CompileBroker::compilation_init();
 #endif
+if (EnableInvokeDynamic) {
+// Pre-initialize some JSR292 core classes to avoid deadlock during class loading.
+// It is done after compilers are initialized, because otherwise compilations of
+// signature polymorphic MH intrinsics can be missed
+// (see SystemDictionary::find_method_handle_intrinsic).
+initialize_class(vmSymbols::java_lang_invoke_MethodHandle(), CHECK_0);
+initialize_class(vmSymbols::java_lang_invoke_MemberName(), CHECK_0);
+initialize_class(vmSymbols::java_lang_invoke_MethodHandleNatives(), CHECK_0);
+}
 #if INCLUDE_MANAGEMENT
 Management::initialize(THREAD);
 #endif // INCLUDE_MANAGEMENT
 if (HAS_PENDING_EXCEPTION) {
 char buffer[JVM_MAXPATHLEN];
 char ebuf[1024];
 const char *name = agent->name();
 const char *msg = "Could not find agent library ";
-// First check to see if agent is statcally linked into executable
+// First check to see if agent is statically linked into executable
 if (os::find_builtin_agent(agent, on_load_symbols, num_symbol_entries)) {
 library = agent->os_lib();
 } else if (agent->is_absolute_path()) {
 library = os::dll_load(name, ebuf, sizeof ebuf);
 if (library == NULL) {

Mercurial > hg > truffle

comparison src/share/vm/runtime/thread.cpp @ 14422:2b8e28fdf503