jdk-sandbox: comparison hotspot/src/share/vm/runtime/thread.cpp

equal deleted inserted replaced

-:64752e56d721
+:be27e1b6a4b9
 #include "runtime/vframe_hp.hpp"
 #include "runtime/vmThread.hpp"
 #include "runtime/vm_operations.hpp"
 #include "services/attachListener.hpp"
 #include "services/management.hpp"
+#include "services/memTracker.hpp"
 #include "services/threadService.hpp"
 #include "trace/traceEventTypes.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
 #define DTRACE_THREAD_PROBE(probe, javathread)
 #endif // ndef DTRACE_ENABLED
 // Class hierarchy
 // - Thread
 //   - VMThread
 //   - WatcherThread
 //   - ConcurrentMarkSweepThread
 //   - JavaThread
 //     - CompilerThread
 // ======= Thread ========
 // Support for forcing alignment of thread objects for biased locking
-void* Thread::operator new(size_t size) {
+void* Thread::allocate(size_t size, bool throw_excpt, MEMFLAGS flags) {
 if (UseBiasedLocking) {
 const int alignment = markOopDesc::biased_lock_alignment;
 size_t aligned_size = size + (alignment - sizeof(intptr_t));
-void* real_malloc_addr = CHeapObj::operator new(aligned_size);
+void* real_malloc_addr = throw_excpt? AllocateHeap(aligned_size, flags, CURRENT_PC)
+: os::malloc(aligned_size, flags, CURRENT_PC);
 void* aligned_addr     = (void*) align_size_up((intptr_t) real_malloc_addr, alignment);
 assert(((uintptr_t) aligned_addr + (uintptr_t) size) <=
 ((uintptr_t) real_malloc_addr + (uintptr_t) aligned_size),
 "JavaThread alignment code overflowed allocated storage");
 if (TraceBiasedLocking) {
 real_malloc_addr, aligned_addr);
 }
 ((Thread*) aligned_addr)->_real_malloc_address = real_malloc_addr;
 return aligned_addr;
 } else {
-return CHeapObj::operator new(size);
+return throw_excpt? AllocateHeap(size, flags, CURRENT_PC)
+: os::malloc(size, flags, CURRENT_PC);
 }
 }
 void Thread::operator delete(void* p) {
 if (UseBiasedLocking) {
 void* real_malloc_addr = ((Thread*) p)->_real_malloc_address;
-CHeapObj::operator delete(real_malloc_addr);
+FreeHeap(real_malloc_addr, mtThread);
 } else {
-CHeapObj::operator delete(p);
+FreeHeap(p, mtThread);
 }
 }
 // Base class for all threads: VMThread, WatcherThread, ConcurrentMarkSweepThread,
 set_self_raw_id(0);
 set_lgrp_id(-1);
 // allocated data structures
 set_osthread(NULL);
-set_resource_area(new ResourceArea());
+set_resource_area(new (mtThread)ResourceArea());
-set_handle_area(new HandleArea(NULL));
+set_handle_area(new (mtThread) HandleArea(NULL));
 set_active_handles(NULL);
 set_free_handle_block(NULL);
 set_last_handle_mark(NULL);
 // This initial value ==> never claimed.
 // initialize structure dependent on thread local storage
 ThreadLocalStorage::set_thread(this);
 // set up any platform-specific state.
 os::initialize_thread();
 }
 void Thread::record_stack_base_and_size() {
 set_stack_base(os::current_stack_base());
 set_stack_size(os::current_stack_size());
+// record thread's native stack, stack grows downward
+address vm_base = _stack_base - _stack_size;
+MemTracker::record_virtual_memory_reserve(vm_base, _stack_size,
+CURRENT_PC, this);
+MemTracker::record_virtual_memory_type(vm_base, mtThreadStack);
 }
 Thread::~Thread() {
 // Reclaim the objectmonitors from the omFreeList of the moribund thread.
 ObjectSynchronizer::omFlush (this) ;
+MemTracker::record_virtual_memory_release((_stack_base - _stack_size),
+_stack_size, this);
 // deallocate data structures
 delete resource_area();
 // since the handle marks are using the handle area, we have to deallocated the root
 // handle mark before deallocating the thread's handle area,
 _processed_thread = NULL;
 }
 NamedThread::~NamedThread() {
 if (_name != NULL) {
-FREE_C_HEAP_ARRAY(char, _name);
+FREE_C_HEAP_ARRAY(char, _name, mtThread);
 _name = NULL;
 }
 }
 void NamedThread::set_name(const char* format, ...) {
 guarantee(_name == NULL, "Only get to set name once.");
-_name = NEW_C_HEAP_ARRAY(char, max_name_len);
+_name = NEW_C_HEAP_ARRAY(char, max_name_len, mtThread);
 guarantee(_name != NULL, "alloc failure");
 va_list ap;
 va_start(ap, format);
 jio_vsnprintf(_name, max_name_len, format, ap);
 va_end(ap);
 set_deopt_nmethod(NULL);
 clear_must_deopt_id();
 set_monitor_chunks(NULL);
 set_next(NULL);
 set_thread_state(_thread_new);
+set_recorder(NULL);
 _terminated = _not_terminated;
 _privileged_stack_top = NULL;
 _array_for_gc = NULL;
 _suspend_equivalent = false;
 _in_deopt_handler = 0;
 _jni_attach_state = _attaching_via_jni;
 } else {
 _jni_attach_state = _not_attaching_via_jni;
 }
 assert(_deferred_card_mark.is_empty(), "Default MemRegion ctor");
+_safepoint_visible = false;
 }
 bool JavaThread::reguard_stack(address cur_sp) {
 if (_stack_guard_state != stack_guard_yellow_disabled) {
 return true; // Stack already guarded or guard pages not needed.
 // %note runtime_23
 os::ThreadType thr_type = os::java_thread;
 thr_type = entry_point == &compiler_thread_entry ? os::compiler_thread :
 os::java_thread;
 os::create_thread(this, thr_type, stack_sz);
+_safepoint_visible = false;
 // The _osthread may be NULL here because we ran out of memory (too many threads active).
 // We need to throw and OutOfMemoryError - however we cannot do this here because the caller
 // may hold a lock and all locks must be unlocked before throwing the exception (throwing
 // the exception consists of creating the exception object & initializing it, initialization
 // will leave the VM via a JavaCall and then all locks must be unlocked).
 JavaThread::~JavaThread() {
 if (TraceThreadEvents) {
 tty->print_cr("terminate thread %p", this);
 }
+// Info NMT that this JavaThread is exiting, its memory
+// recorder should be collected
+assert(!is_safepoint_visible(), "wrong state");
+MemTracker::thread_exiting(this);
 // JSR166 -- return the parker to the free list
 Parker::Release(_parker);
 _parker = NULL ;
 // JVMTI PopFrame support
 void JavaThread::popframe_preserve_args(ByteSize size_in_bytes, void* start) {
 assert(_popframe_preserved_args == NULL, "should not wipe out old PopFrame preserved arguments");
 if (in_bytes(size_in_bytes) != 0) {
-_popframe_preserved_args = NEW_C_HEAP_ARRAY(char, in_bytes(size_in_bytes));
+_popframe_preserved_args = NEW_C_HEAP_ARRAY(char, in_bytes(size_in_bytes), mtThread);
 _popframe_preserved_args_size = in_bytes(size_in_bytes);
 Copy::conjoint_jbytes(start, _popframe_preserved_args, _popframe_preserved_args_size);
 }
 }
 return in_WordSize(sz / wordSize);
 }
 void JavaThread::popframe_free_preserved_args() {
 assert(_popframe_preserved_args != NULL, "should not free PopFrame preserved arguments twice");
-FREE_C_HEAP_ARRAY(char, (char*) _popframe_preserved_args);
+FREE_C_HEAP_ARRAY(char, (char*) _popframe_preserved_args, mtThread);
 _popframe_preserved_args = NULL;
 _popframe_preserved_args_size = 0;
 }
 #ifndef PRODUCT
 // Initialize the os module after parsing the args
 jint os_init_2_result = os::init_2();
 if (os_init_2_result != JNI_OK) return os_init_2_result;
+// intialize TLS
+ThreadLocalStorage::init();
+// Bootstrap native memory tracking, so it can start recording memory
+// activities before worker thread is started. This is the first phase
+// of bootstrapping, VM is currently running in single-thread mode.
+MemTracker::bootstrap_single_thread();
 // Initialize output stream logging
 ostream_init_log();
 // Convert -Xrun to -agentlib: if there is no JVM_OnLoad
 // Must be before create_vm_init_agents()
 // Initialize Threads state
 _thread_list = NULL;
 _number_of_threads = 0;
 _number_of_non_daemon_threads = 0;
-// Initialize TLS
-ThreadLocalStorage::init();
 // Initialize global data structures and create system classes in heap
 vm_init_globals();
 // Attach the main thread to this os thread
 main_thread->create_stack_guard_pages();
 // Initialize Java-Level synchronization subsystem
 ObjectMonitor::Initialize() ;
+// Second phase of bootstrapping, VM is about entering multi-thread mode
+MemTracker::bootstrap_multi_thread();
 // Initialize global modules
 jint status = init_globals();
 if (status != JNI_OK) {
 delete main_thread;
 *canTryAgain = false; // don't let caller call JNI_CreateJavaVM again
 if (VerifyBeforeGC &&
 Universe::heap()->total_collections() >= VerifyGCStartAt) {
 Universe::heap()->prepare_for_verify();
 Universe::verify();   // make sure we're starting with a clean slate
 }
+// Fully start NMT
+MemTracker::start();
 // Create the VMThread
 { TraceTime timer("Start VMThread", TraceStartupTime);
 VMThread::create();
 Thread* vmthread = VMThread::vm_thread();
 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);
+char *buf = NEW_C_HEAP_ARRAY(char, len, mtThread);
 jio_snprintf(buf, len, "%s%s%s%s", msg, name, sub_msg, ebuf);
 // If we can't find the agent, exit.
 vm_exit_during_initialization(buf, NULL);
-FREE_C_HEAP_ARRAY(char, buf);
+FREE_C_HEAP_ARRAY(char, buf, mtThread);
 }
 } else {
 // Try to load the agent from the standard dll directory
 os::dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(), name);
 library = os::dll_load(buffer, ebuf, sizeof ebuf);
 char *props = Arguments::get_kernel_properties();
 char *home  = Arguments::get_java_home();
 const char *fmt   = "%s/bin/java %s -Dkernel.background.download=false"
 " sun.jkernel.DownloadManager -download client_jvm";
 size_t length = strlen(props) + strlen(home) + strlen(fmt) + 1;
-char *cmd = NEW_C_HEAP_ARRAY(char, length);
+char *cmd = NEW_C_HEAP_ARRAY(char, length, mtThread);
 jio_snprintf(cmd, length, fmt, home, props);
 int status = os::fork_and_exec(cmd);
 FreeHeap(props);
 if (status == -1) {
 warning(cmd);
 vm_exit_during_initialization("fork_and_exec failed: %s",
 strerror(errno));
 }
-FREE_C_HEAP_ARRAY(char, cmd);
+FREE_C_HEAP_ARRAY(char, cmd, mtThread);
 // when this comes back the instrument.dll should be where it belongs.
 library = os::dll_load(buffer, ebuf, sizeof ebuf);
 }
 #endif // KERNEL
 if (library == NULL) { // Try the local directory
 os::dll_build_name(buffer, sizeof(buffer), ns, name);
 library = os::dll_load(buffer, ebuf, sizeof ebuf);
 if (library == NULL) {
 const char *sub_msg = " on the library path, with error: ";
 size_t len = strlen(msg) + strlen(name) + strlen(sub_msg) + strlen(ebuf) + 1;
-char *buf = NEW_C_HEAP_ARRAY(char, len);
+char *buf = NEW_C_HEAP_ARRAY(char, len, mtThread);
 jio_snprintf(buf, len, "%s%s%s%s", msg, name, sub_msg, ebuf);
 // If we can't find the agent, exit.
 vm_exit_during_initialization(buf, NULL);
-FREE_C_HEAP_ARRAY(char, buf);
+FREE_C_HEAP_ARRAY(char, buf, mtThread);
 }
 }
 }
 agent->set_os_lib(library);
 }
 // there is a serious error in VM. The two shutdown paths are not exactly
 // the same, but they share Shutdown.shutdown() at Java level and before_exit()
 // and VM_Exit op at VM level.
 //
 // Shutdown sequence:
+//   + Shutdown native memory tracking if it is on
 //   + Wait until we are the last non-daemon thread to execute
 //     <-- every thing is still working at this moment -->
 //   + Call java.lang.Shutdown.shutdown(), which will invoke Java level
 //        shutdown hooks, run finalizers if finalization-on-exit
 //   + Call before_exit(), prepare for VM exit
 //
 Threads_lock->wait(!Mutex::_no_safepoint_check_flag, 0,
 Mutex::_as_suspend_equivalent_flag);
 }
+// Shutdown NMT before exit. Otherwise,
+// it will run into trouble when system destroys static variables.
+MemTracker::shutdown(MemTracker::NMT_normal);
 // Hang forever on exit if we are reporting an error.
 if (ShowMessageBoxOnError && is_error_reported()) {
 os::infinite_sleep();
 }
 os::wait_for_keypress_at_exit();
 if ((!force_daemon) && (threadObj == NULL || !java_lang_Thread::is_daemon(threadObj))) {
 _number_of_non_daemon_threads++;
 daemon = false;
 }
+p->set_safepoint_visible(true);
 ThreadService::add_thread(p, daemon);
 // Possible GC point.
 Events::log(p, "Thread added: " INTPTR_FORMAT, p);
 }
 // Make sure that safepoint code disregard this thread. This is needed since
 // the thread might mess around with locks after this point. This can cause it
 // to do callbacks into the safepoint code. However, the safepoint code is not aware
 // of this thread since it is removed from the queue.
 p->set_terminated_value();
+// Now, this thread is not visible to safepoint
+p->set_safepoint_visible(false);
 } // unlock Threads_lock
 // Since Events::log uses a lock, we grab it outside the Threads_lock
 Events::log(p, "Thread exited: " INTPTR_FORMAT, p);
 }

changeset 13195	be27e1b6a4b9
parent 12373	09835f62dc29
child 13196	6b399731153b