src/hotspot/share/services/dtraceAttacher.cpp

rev 54697 : imported patch 8221734-v2-merge
rev 54698 : imported patch 8221734-v2

*** 1,7 ****
  /*
!  * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 31,57 ****
  #include "runtime/vmOperations.hpp"
  #include "services/dtraceAttacher.hpp"
  
  #ifdef SOLARIS
  
- class VM_DeoptimizeTheWorld : public VM_Operation {
-  public:
-   VMOp_Type type() const {
-     return VMOp_DeoptimizeTheWorld;
-   }
-   void doit() {
-     CodeCache::mark_all_nmethods_for_deoptimization();
-     ResourceMark rm;
-     DeoptimizationMarker dm;
-     // Deoptimize all activations depending on marked methods
-     Deoptimization::deoptimize_dependents();
- 
-     // Mark the dependent methods non entrant
-     CodeCache::make_marked_nmethods_not_entrant();
-   }
- };
- 
  static void set_bool_flag(const char* flag, bool value) {
    JVMFlag::boolAtPut((char*)flag, strlen(flag), &value,
                                JVMFlag::ATTACH_ON_DEMAND);
  }
  
--- 31,40 ----
*** 72,83 ****
      changed = true;
    }
  
    if (changed) {
      // one or more flags changed, need to deoptimize
!     VM_DeoptimizeTheWorld op;
!     VMThread::execute(&op);
    }
  }
  
  // Disable only the "fine grained" flags. Do *not* touch
  // the overall "ExtendedDTraceProbes" flag.
--- 55,66 ----
      changed = true;
    }
  
    if (changed) {
      // one or more flags changed, need to deoptimize
!     CodeCache::mark_all_nmethods_for_deoptimization();
!     Deoptimization::deoptimize_all_marked();
    }
  }
  
  // Disable only the "fine grained" flags. Do *not* touch
  // the overall "ExtendedDTraceProbes" flag.
*** 95,106 ****
      set_bool_flag("DTraceMonitorProbes", false);
      changed = true;
    }
    if (changed) {
      // one or more flags changed, need to deoptimize
!     VM_DeoptimizeTheWorld op;
!     VMThread::execute(&op);
    }
  }
  
  // Do clean-up on "all door clients detached" event.
  void DTrace::detach_all_clients() {
--- 78,89 ----
      set_bool_flag("DTraceMonitorProbes", false);
      changed = true;
    }
    if (changed) {
      // one or more flags changed, need to deoptimize
!     CodeCache::mark_all_nmethods_for_deoptimization();
!     Deoptimization::deoptimize_all_marked();
    }
  }
  
  // Do clean-up on "all door clients detached" event.
  void DTrace::detach_all_clients() {