--- a/src/hotspot/share/classfile/classLoaderData.cpp Tue Aug 28 09:06:23 2018 +0200
+++ b/src/hotspot/share/classfile/classLoaderData.cpp Tue Aug 28 10:10:11 2018 -0400
@@ -76,11 +76,6 @@
#include "utilities/growableArray.hpp"
#include "utilities/macros.hpp"
#include "utilities/ostream.hpp"
-#include "utilities/ticks.hpp"
-#if INCLUDE_JFR
-#include "jfr/jfr.hpp"
-#include "jfr/jfrEvents.hpp"
-#endif
volatile size_t ClassLoaderDataGraph::_num_array_classes = 0;
volatile size_t ClassLoaderDataGraph::_num_instance_classes = 0;
@@ -1316,29 +1311,6 @@
}
#endif // PRODUCT
-#if INCLUDE_JFR
-static Ticks class_unload_time;
-static void post_class_unload_event(Klass* const k) {
- assert(k != NULL, "invariant");
- EventClassUnload event(UNTIMED);
- event.set_endtime(class_unload_time);
- event.set_unloadedClass(k);
- event.set_definingClassLoader(k->class_loader_data());
- event.commit();
-}
-
-static void post_class_unload_events() {
- assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");
- if (Jfr::is_enabled()) {
- if (EventClassUnload::is_enabled()) {
- class_unload_time = Ticks::now();
- ClassLoaderDataGraph::classes_unloading_do(&post_class_unload_event);
- }
- Jfr::on_unloading_classes();
- }
-}
-#endif // INCLUDE_JFR
-
// Move class loader data from main list to the unloaded list for unloading
// and deallocation later.
bool ClassLoaderDataGraph::do_unloading(bool do_cleaning) {
@@ -1382,10 +1354,6 @@
_unloading = dead;
}
- if (seen_dead_loader) {
- JFR_ONLY(post_class_unload_events();)
- }
-
log_debug(class, loader, data)("do_unloading: loaders processed %u, loaders removed %u", loaders_processed, loaders_removed);
return seen_dead_loader;