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

comparison src/share/vm/runtime/thread.cpp @ 12355:cefad50507d8

Merge with hs25-b53

author	Gilles Duboscq <duboscq@ssw.jku.at>
date	Fri, 11 Oct 2013 10:38:03 +0200
parents	ec267141f753 190899198332
children	096c224171c4

comparison

equal deleted inserted replaced

-:ccb4f2af2319
+:cefad50507d8
 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
 for (int i = 0; i < GRAAL_COUNTERS_SIZE; i++) {
 _graal_counters[i] = 0;
 }
 #endif // GRAAL_COUNTER_SIZE > 0
 #endif // GRAAL
-_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;
 // 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();
 }
 #ifndef USDT2
 // initialize compiler(s)
 #if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || defined(GRAALVM)
 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) {
 // Find a command line agent library and return its entry point for
 //         -agentlib:  -agentpath:   -Xrun
 // num_symbol_entries must be passed-in since only the caller knows the number of symbols in the array.
 static OnLoadEntry_t lookup_on_load(AgentLibrary* agent, const char *on_load_symbols[], size_t num_symbol_entries) {
 OnLoadEntry_t on_load_entry = NULL;
-void *library = agent->os_lib();  // check if we have looked it up before
+void *library = NULL;
-if (library == NULL) {
+if (!agent->valid()) {
 char buffer[JVM_MAXPATHLEN];
 char ebuf[1024];
 const char *name = agent->name();
 const char *msg = "Could not find agent library ";
-if (agent->is_absolute_path()) {
+// 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) {
 const char *sub_msg = " in absolute path, with error: ";
 size_t len = strlen(msg) + strlen(name) + strlen(sub_msg) + strlen(ebuf) + 1;
 char *buf = NEW_C_HEAP_ARRAY(char, len, mtThread);
 FREE_C_HEAP_ARRAY(char, buf, mtThread);
 }
 }
 }
 agent->set_os_lib(library);
+agent->set_valid();
 }
 // Find the OnLoad function.
-for (size_t symbol_index = 0; symbol_index < num_symbol_entries; symbol_index++) {
+on_load_entry =
-on_load_entry = CAST_TO_FN_PTR(OnLoadEntry_t, os::dll_lookup(library, on_load_symbols[symbol_index]));
+CAST_TO_FN_PTR(OnLoadEntry_t, os::find_agent_function(agent,
-if (on_load_entry != NULL) break;
+false,
-}
+on_load_symbols,
+num_symbol_entries));
 return on_load_entry;
 }
 // Find the JVM_OnLoad entry point
 static OnLoadEntry_t lookup_jvm_on_load(AgentLibrary* agent) {
 }
 void Threads::shutdown_vm_agents() {
 // Send any Agent_OnUnload notifications
 const char *on_unload_symbols[] = AGENT_ONUNLOAD_SYMBOLS;
+size_t num_symbol_entries = ARRAY_SIZE(on_unload_symbols);
 extern struct JavaVM_ main_vm;
 for (AgentLibrary* agent = Arguments::agents(); agent != NULL; agent = agent->next()) {
 // Find the Agent_OnUnload function.
-for (uint symbol_index = 0; symbol_index < ARRAY_SIZE(on_unload_symbols); symbol_index++) {
+Agent_OnUnload_t unload_entry = CAST_TO_FN_PTR(Agent_OnUnload_t,
-Agent_OnUnload_t unload_entry = CAST_TO_FN_PTR(Agent_OnUnload_t,
+os::find_agent_function(agent,
-os::dll_lookup(agent->os_lib(), on_unload_symbols[symbol_index]));
+false,
+on_unload_symbols,
-// Invoke the Agent_OnUnload function
+num_symbol_entries));
-if (unload_entry != NULL) {
-JavaThread* thread = JavaThread::current();
+// Invoke the Agent_OnUnload function
-ThreadToNativeFromVM ttn(thread);
+if (unload_entry != NULL) {
-HandleMark hm(thread);
+JavaThread* thread = JavaThread::current();
-(*unload_entry)(&main_vm);
+ThreadToNativeFromVM ttn(thread);
-break;
+HandleMark hm(thread);
-}
+(*unload_entry)(&main_vm);
 }
 }
 }
 // Called for after the VM is initialized for -Xrun libraries which have not been converted to agent libraries

Mercurial > hg > truffle

comparison src/share/vm/runtime/thread.cpp @ 12355:cefad50507d8