Mercurial > hg > truffle
diff src/share/vm/runtime/thread.cpp @ 6854:fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
Summary: Change makefiles so that targets and parameters can be overridden by alternate makefiles.
Reviewed-by: dholmes, coleenp
author | jprovino |
---|---|
date | Wed, 10 Oct 2012 14:35:58 -0400 |
parents | c088e2e95e69 |
children | 5876f980ea19 |
line wrap: on
line diff
--- a/src/share/vm/runtime/thread.cpp Fri Oct 05 13:37:08 2012 -0700 +++ b/src/share/vm/runtime/thread.cpp Wed Oct 10 14:35:58 2012 -0400 @@ -321,12 +321,14 @@ // set up any platform-specific state. os::initialize_thread(this); +#if INCLUDE_NMT // record thread's native stack, stack grows downward if (MemTracker::is_on()) { address stack_low_addr = stack_base() - stack_size(); MemTracker::record_thread_stack(stack_low_addr, stack_size(), this, CURRENT_PC); } +#endif // INCLUDE_NMT } @@ -338,10 +340,12 @@ // 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 if (_stack_base != NULL) { address low_stack_addr = stack_base() - stack_size(); MemTracker::release_thread_stack(low_stack_addr, stack_size(), this); } +#endif // INCLUDE_NMT // deallocate data structures delete resource_area(); @@ -1357,7 +1361,9 @@ set_monitor_chunks(NULL); set_next(NULL); set_thread_state(_thread_new); +#if INCLUDE_NMT set_recorder(NULL); +#endif _terminated = _not_terminated; _privileged_stack_top = NULL; _array_for_gc = NULL; @@ -3523,7 +3529,9 @@ #endif /* USDT2 */ // record VM initialization completion time +#if INCLUDE_MANAGEMENT Management::record_vm_init_completed(); +#endif // INCLUDE_MANAGEMENT // Compute system loader. Note that this has to occur after set_init_completed, since // valid exceptions may be thrown in the process. @@ -3584,9 +3592,14 @@ } // initialize compiler(s) +#if defined(COMPILER1) || defined(COMPILER2) CompileBroker::compilation_init(); - +#endif + +#if INCLUDE_MANAGEMENT Management::initialize(THREAD); +#endif // INCLUDE_MANAGEMENT + if (HAS_PENDING_EXCEPTION) { // management agent fails to start possibly due to // configuration problem and is responsible for printing @@ -3756,6 +3769,7 @@ AgentLibrary* agent; JvmtiExport::enter_onload_phase(); + for (agent = Arguments::agents(); agent != NULL; agent = agent->next()) { OnLoadEntry_t on_load_entry = lookup_agent_on_load(agent);