Mercurial > hg > truffle
comparison src/share/vm/runtime/java.cpp @ 4840:0a10d80352d5
Merge
author | brutisso |
---|---|
date | Fri, 27 Jan 2012 09:04:57 +0100 |
parents | 94ec88ca68e2 |
children | 33df1aeaebbf f8de958e5b2c d2a62e0f25eb |
comparison
equal
deleted
inserted
replaced
4839:b4ebad3520bb | 4840:0a10d80352d5 |
---|---|
55 #include "runtime/sharedRuntime.hpp" | 55 #include "runtime/sharedRuntime.hpp" |
56 #include "runtime/statSampler.hpp" | 56 #include "runtime/statSampler.hpp" |
57 #include "runtime/task.hpp" | 57 #include "runtime/task.hpp" |
58 #include "runtime/timer.hpp" | 58 #include "runtime/timer.hpp" |
59 #include "runtime/vm_operations.hpp" | 59 #include "runtime/vm_operations.hpp" |
60 #include "trace/tracing.hpp" | |
61 #include "trace/traceEventTypes.hpp" | |
60 #include "utilities/dtrace.hpp" | 62 #include "utilities/dtrace.hpp" |
61 #include "utilities/globalDefinitions.hpp" | 63 #include "utilities/globalDefinitions.hpp" |
62 #include "utilities/histogram.hpp" | 64 #include "utilities/histogram.hpp" |
63 #include "utilities/vmError.hpp" | 65 #include "utilities/vmError.hpp" |
64 #ifdef TARGET_ARCH_x86 | 66 #ifdef TARGET_ARCH_x86 |
500 } | 502 } |
501 | 503 |
502 if (JvmtiExport::should_post_thread_life()) { | 504 if (JvmtiExport::should_post_thread_life()) { |
503 JvmtiExport::post_thread_end(thread); | 505 JvmtiExport::post_thread_end(thread); |
504 } | 506 } |
507 | |
508 EVENT_BEGIN(TraceEventThreadEnd, event); | |
509 EVENT_COMMIT(event, | |
510 EVENT_SET(event, javalangthread, java_lang_Thread::thread_id(thread->threadObj()))); | |
511 | |
505 // Always call even when there are not JVMTI environments yet, since environments | 512 // Always call even when there are not JVMTI environments yet, since environments |
506 // may be attached late and JVMTI must track phases of VM execution | 513 // may be attached late and JVMTI must track phases of VM execution |
507 JvmtiExport::post_vm_death(); | 514 JvmtiExport::post_vm_death(); |
508 Threads::shutdown_vm_agents(); | 515 Threads::shutdown_vm_agents(); |
509 | 516 |