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

comparison src/share/vm/runtime/thread.cpp @ 11173:6b0fd0964b87

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/

author	Doug Simon <doug.simon@oracle.com>
date	Wed, 31 Jul 2013 11:00:54 +0200
parents	d55f24eac4b1 02d7aa1456c9
children	d7964e96b0b0

comparison

equal deleted inserted replaced

-:4ea54634f03e
+:6b0fd0964b87
 #include "oops/symbol.hpp"
 #include "prims/jvm_misc.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "prims/jvmtiThreadState.hpp"
 #include "prims/privilegedStack.hpp"
-#include "runtime/aprofiler.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/fprofiler.hpp"
 #include "runtime/frame.inline.hpp"
 set_lgrp_id(-1);
 // allocated data structures
 set_osthread(NULL);
 set_resource_area(new (mtThread)ResourceArea());
+DEBUG_ONLY(_current_resource_mark = NULL;)
 set_handle_area(new (mtThread) HandleArea(NULL));
-set_metadata_handles(new (ResourceObj::C_HEAP, mtClass) GrowableArray<Metadata*>(300, true));
+set_metadata_handles(new (ResourceObj::C_HEAP, mtClass) GrowableArray<Metadata*>(30, true));
 set_active_handles(NULL);
 set_free_handle_block(NULL);
 set_last_handle_mark(NULL);
 // This initial value ==> never claimed.
 return false;
 }
+bool Thread::is_in_usable_stack(address adr) const {
+size_t stack_guard_size = os::uses_stack_guard_pages() ? (StackYellowPages + StackRedPages) * os::vm_page_size() : 0;
+size_t usable_stack_size = _stack_size - stack_guard_size;
+return ((adr < stack_base()) && (adr >= stack_base() - usable_stack_size));
+}
 // We had to move these methods here, because vm threads get into ObjectSynchronizer::enter
 // However, there is a note in JavaThread::is_lock_owned() about the VM threads not being
 // used for compilation in the future. If that change is made, the need for these methods
 // should be revisited, and they should be removed if possible.
 WatcherThread* WatcherThread::_watcher_thread   = NULL;
 bool WatcherThread::_startable = false;
 volatile bool  WatcherThread::_should_terminate = false;
-WatcherThread::WatcherThread() : Thread() {
+WatcherThread::WatcherThread() : Thread(), _crash_protection(NULL) {
 assert(watcher_thread() == NULL, "we can only allocate one WatcherThread");
 if (os::create_thread(this, os::watcher_thread)) {
 _watcher_thread = this;
 // Set the watcher thread to the highest OS priority which should not be
 create_vm_init_libraries();
 }
 initialize_class(vmSymbols::java_lang_String(), CHECK_0);
-if (AggressiveOpts) {
-{
-// Forcibly initialize java/util/HashMap and mutate the private
-// static final "frontCacheEnabled" field before we start creating instances
-#ifdef ASSERT
-Klass* tmp_k = SystemDictionary::find(vmSymbols::java_util_HashMap(), Handle(), Handle(), CHECK_0);
-assert(tmp_k == NULL, "java/util/HashMap should not be loaded yet");
-#endif
-Klass* k_o = SystemDictionary::resolve_or_null(vmSymbols::java_util_HashMap(), Handle(), Handle(), CHECK_0);
-KlassHandle k = KlassHandle(THREAD, k_o);
-guarantee(k.not_null(), "Must find java/util/HashMap");
-instanceKlassHandle ik = instanceKlassHandle(THREAD, k());
-ik->initialize(CHECK_0);
-fieldDescriptor fd;
-// Possible we might not find this field; if so, don't break
-if (ik->find_local_field(vmSymbols::frontCacheEnabled_name(), vmSymbols::bool_signature(), &fd)) {
-k()->java_mirror()->bool_field_put(fd.offset(), true);
-}
-}
-if (UseStringCache) {
-// Forcibly initialize java/lang/StringValue and mutate the private
-// static final "stringCacheEnabled" field before we start creating instances
-Klass* k_o = SystemDictionary::resolve_or_null(vmSymbols::java_lang_StringValue(), Handle(), Handle(), CHECK_0);
-// Possible that StringValue isn't present: if so, silently don't break
-if (k_o != NULL) {
-KlassHandle k = KlassHandle(THREAD, k_o);
-instanceKlassHandle ik = instanceKlassHandle(THREAD, k());
-ik->initialize(CHECK_0);
-fieldDescriptor fd;
-// Possible we might not find this field: if so, silently don't break
-if (ik->find_local_field(vmSymbols::stringCacheEnabled_name(), vmSymbols::bool_signature(), &fd)) {
-k()->java_mirror()->bool_field_put(fd.offset(), true);
-}
-}
-}
-}
 // Initialize java_lang.System (needed before creating the thread)
 initialize_class(vmSymbols::java_lang_System(), CHECK_0);
 initialize_class(vmSymbols::java_lang_ThreadGroup(), CHECK_0);
 Handle thread_group = create_initial_thread_group(CHECK_0);
 Universe::set_main_thread_group(thread_group());
 // Signal Dispatcher needs to be started before VMInit event is posted
 os::signal_init();
 // Start Attach Listener if +StartAttachListener or it can't be started lazily
 if (!DisableAttachMechanism) {
+AttachListener::vm_start();
 if (StartAttachListener || AttachListener::init_at_startup()) {
 AttachListener::init();
 }
 }
 // stack trace if appropriate. Simply exit VM.
 vm_exit(1);
 }
 if (Arguments::has_profile())       FlatProfiler::engage(main_thread, true);
-if (Arguments::has_alloc_profile()) AllocationProfiler::engage();
 if (MemProfiling)                   MemProfiler::engage();
 StatSampler::engage();
 if (CheckJNICalls)                  JniPeriodicChecker::engage();
 BiasedLocking::init();

Mercurial > hg > truffle

comparison src/share/vm/runtime/thread.cpp @ 11173:6b0fd0964b87