Mercurial > hg > truffle
comparison src/share/vm/classfile/classLoaderData.cpp @ 17478:e254e5940c19
Merge
author | kizune |
---|---|
date | Thu, 05 Dec 2013 16:37:29 +0400 |
parents | 86e6d691f2e1 |
children | ce86c36b8921 |
comparison
equal
deleted
inserted
replaced
17477:0611ce949aaa | 17478:e254e5940c19 |
---|---|
60 #include "runtime/jniHandles.hpp" | 60 #include "runtime/jniHandles.hpp" |
61 #include "runtime/mutex.hpp" | 61 #include "runtime/mutex.hpp" |
62 #include "runtime/safepoint.hpp" | 62 #include "runtime/safepoint.hpp" |
63 #include "runtime/synchronizer.hpp" | 63 #include "runtime/synchronizer.hpp" |
64 #include "utilities/growableArray.hpp" | 64 #include "utilities/growableArray.hpp" |
65 #include "utilities/macros.hpp" | |
65 #include "utilities/ostream.hpp" | 66 #include "utilities/ostream.hpp" |
66 | 67 |
67 #if INCLUDE_TRACE | 68 #if INCLUDE_TRACE |
68 #include "trace/tracing.hpp" | 69 #include "trace/tracing.hpp" |
69 #endif | 70 #endif |
70 | |
71 | 71 |
72 ClassLoaderData * ClassLoaderData::_the_null_class_loader_data = NULL; | 72 ClassLoaderData * ClassLoaderData::_the_null_class_loader_data = NULL; |
73 | 73 |
74 ClassLoaderData::ClassLoaderData(Handle h_class_loader, bool is_anonymous, Dependencies dependencies) : | 74 ClassLoaderData::ClassLoaderData(Handle h_class_loader, bool is_anonymous, Dependencies dependencies) : |
75 _class_loader(h_class_loader()), | 75 _class_loader(h_class_loader()), |
752 #if INCLUDE_TRACE | 752 #if INCLUDE_TRACE |
753 assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!"); | 753 assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!"); |
754 if (Tracing::enabled()) { | 754 if (Tracing::enabled()) { |
755 if (Tracing::is_event_enabled(TraceClassUnloadEvent)) { | 755 if (Tracing::is_event_enabled(TraceClassUnloadEvent)) { |
756 assert(_unloading != NULL, "need class loader data unload list!"); | 756 assert(_unloading != NULL, "need class loader data unload list!"); |
757 _class_unload_time = Tracing::time(); | 757 _class_unload_time = Ticks::now(); |
758 classes_unloading_do(&class_unload_event); | 758 classes_unloading_do(&class_unload_event); |
759 } | 759 } |
760 Tracing::on_unloading_classes(); | 760 Tracing::on_unloading_classes(); |
761 } | 761 } |
762 #endif | 762 #endif |
830 } | 830 } |
831 } | 831 } |
832 | 832 |
833 #if INCLUDE_TRACE | 833 #if INCLUDE_TRACE |
834 | 834 |
835 TracingTime ClassLoaderDataGraph::_class_unload_time; | 835 Ticks ClassLoaderDataGraph::_class_unload_time; |
836 | 836 |
837 void ClassLoaderDataGraph::class_unload_event(Klass* const k) { | 837 void ClassLoaderDataGraph::class_unload_event(Klass* const k) { |
838 | 838 |
839 // post class unload event | 839 // post class unload event |
840 EventClassUnload event(UNTIMED); | 840 EventClassUnload event(UNTIMED); |