comparison src/share/vm/runtime/java.cpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents ef00461e29af 94ec88ca68e2
children 957c266d8bc5
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
58 #include "runtime/sharedRuntime.hpp" 58 #include "runtime/sharedRuntime.hpp"
59 #include "runtime/statSampler.hpp" 59 #include "runtime/statSampler.hpp"
60 #include "runtime/task.hpp" 60 #include "runtime/task.hpp"
61 #include "runtime/timer.hpp" 61 #include "runtime/timer.hpp"
62 #include "runtime/vm_operations.hpp" 62 #include "runtime/vm_operations.hpp"
63 #include "trace/tracing.hpp"
64 #include "trace/traceEventTypes.hpp"
63 #include "utilities/dtrace.hpp" 65 #include "utilities/dtrace.hpp"
64 #include "utilities/globalDefinitions.hpp" 66 #include "utilities/globalDefinitions.hpp"
65 #include "utilities/histogram.hpp" 67 #include "utilities/histogram.hpp"
66 #include "utilities/vmError.hpp" 68 #include "utilities/vmError.hpp"
67 #ifdef TARGET_ARCH_x86 69 #ifdef TARGET_ARCH_x86
513 } 515 }
514 516
515 if (JvmtiExport::should_post_thread_life()) { 517 if (JvmtiExport::should_post_thread_life()) {
516 JvmtiExport::post_thread_end(thread); 518 JvmtiExport::post_thread_end(thread);
517 } 519 }
520
521 EVENT_BEGIN(TraceEventThreadEnd, event);
522 EVENT_COMMIT(event,
523 EVENT_SET(event, javalangthread, java_lang_Thread::thread_id(thread->threadObj())));
524
518 // Always call even when there are not JVMTI environments yet, since environments 525 // Always call even when there are not JVMTI environments yet, since environments
519 // may be attached late and JVMTI must track phases of VM execution 526 // may be attached late and JVMTI must track phases of VM execution
520 JvmtiExport::post_vm_death(); 527 JvmtiExport::post_vm_death();
521 Threads::shutdown_vm_agents(); 528 Threads::shutdown_vm_agents();
522 529