src/hotspot/share/runtime/serviceThread.cpp

*** 35,48 ****
  #include "runtime/serviceThread.hpp"
  #include "runtime/mutexLocker.hpp"
  #include "runtime/os.hpp"
  #include "prims/jvmtiImpl.hpp"
  #include "prims/resolvedMethodTable.hpp"
- #include "services/diagnosticArgument.hpp"
- #include "services/diagnosticFramework.hpp"
- #include "services/gcNotifier.hpp"
- #include "services/lowMemoryDetector.hpp"
  
  ServiceThread* ServiceThread::_instance = NULL;
  
  void ServiceThread::initialize() {
    EXCEPTION_MARK;
--- 35,44 ----
*** 115,128 ****
      SystemDictionary::vm_weak_oop_storage()
    };
    const size_t oopstorage_count = ARRAY_SIZE(oopstorages);
  
    while (true) {
-     bool sensors_changed = false;
      bool has_jvmti_events = false;
-     bool has_gc_notification_event = false;
-     bool has_dcmd_notification_event = false;
      bool stringtable_work = false;
      bool symboltable_work = false;
      bool resolved_method_table_work = false;
      bool protection_domain_table_work = false;
      bool oopstorage_work = false;
--- 111,121 ----
*** 142,155 ****
        MonitorLocker ml(Service_lock, Mutex::_no_safepoint_check_flag);
        // Process all available work on each (outer) iteration, rather than
        // only the first recognized bit of work, to avoid frequently true early
        // tests from potentially starving later work.  Hence the use of
        // arithmetic-or to combine results; we don't want short-circuiting.
!       while (((sensors_changed = LowMemoryDetector::has_pending_requests()) |
!               (has_jvmti_events = JvmtiDeferredEventQueue::has_events()) |
!               (has_gc_notification_event = GCNotifier::has_event()) |
!               (has_dcmd_notification_event = DCmdFactory::has_pending_jmx_notification()) |
                (stringtable_work = StringTable::has_work()) |
                (symboltable_work = SymbolTable::has_work()) |
                (resolved_method_table_work = ResolvedMethodTable::has_work()) |
                (protection_domain_table_work = SystemDictionary::pd_cache_table()->has_work()) |
                (oopstorage_work = needs_oopstorage_cleanup(oopstorages,
--- 135,145 ----
        MonitorLocker ml(Service_lock, Mutex::_no_safepoint_check_flag);
        // Process all available work on each (outer) iteration, rather than
        // only the first recognized bit of work, to avoid frequently true early
        // tests from potentially starving later work.  Hence the use of
        // arithmetic-or to combine results; we don't want short-circuiting.
!       while (((has_jvmti_events = JvmtiDeferredEventQueue::has_events()) |              
                (stringtable_work = StringTable::has_work()) |
                (symboltable_work = SymbolTable::has_work()) |
                (resolved_method_table_work = ResolvedMethodTable::has_work()) |
                (protection_domain_table_work = SystemDictionary::pd_cache_table()->has_work()) |
                (oopstorage_work = needs_oopstorage_cleanup(oopstorages,
*** 176,197 ****
  
      if (has_jvmti_events) {
        jvmti_event.post();
      }
  
-     if (sensors_changed) {
-       LowMemoryDetector::process_sensor_changes(jt);
-     }
- 
-     if(has_gc_notification_event) {
-       GCNotifier::sendNotification(CHECK);
-     }
- 
-     if(has_dcmd_notification_event) {
-       DCmdFactory::send_notification(CHECK);
-     }
- 
      if (resolved_method_table_work) {
        ResolvedMethodTable::do_concurrent_work(jt);
      }
  
      if (protection_domain_table_work) {
--- 166,175 ----