Mercurial > hg > truffle
diff src/share/vm/classfile/classLoaderData.cpp @ 17478:e254e5940c19
Merge
author | kizune |
---|---|
date | Thu, 05 Dec 2013 16:37:29 +0400 |
parents | 86e6d691f2e1 |
children | ce86c36b8921 |
line wrap: on
line diff
--- a/src/share/vm/classfile/classLoaderData.cpp Tue Dec 03 14:13:06 2013 +0400 +++ b/src/share/vm/classfile/classLoaderData.cpp Thu Dec 05 16:37:29 2013 +0400 @@ -62,13 +62,13 @@ #include "runtime/safepoint.hpp" #include "runtime/synchronizer.hpp" #include "utilities/growableArray.hpp" +#include "utilities/macros.hpp" #include "utilities/ostream.hpp" #if INCLUDE_TRACE #include "trace/tracing.hpp" #endif - ClassLoaderData * ClassLoaderData::_the_null_class_loader_data = NULL; ClassLoaderData::ClassLoaderData(Handle h_class_loader, bool is_anonymous, Dependencies dependencies) : @@ -754,7 +754,7 @@ if (Tracing::enabled()) { if (Tracing::is_event_enabled(TraceClassUnloadEvent)) { assert(_unloading != NULL, "need class loader data unload list!"); - _class_unload_time = Tracing::time(); + _class_unload_time = Ticks::now(); classes_unloading_do(&class_unload_event); } Tracing::on_unloading_classes(); @@ -832,7 +832,7 @@ #if INCLUDE_TRACE -TracingTime ClassLoaderDataGraph::_class_unload_time; +Ticks ClassLoaderDataGraph::_class_unload_time; void ClassLoaderDataGraph::class_unload_event(Klass* const k) {