src/hotspot/share/services/diagnosticFramework.cpp

*** 489,503 ****
              &args2,
              CHECK);
    }
  }
  
- Mutex* DCmdFactory::_dcmdFactory_lock = new Mutex(Mutex::leaf, "DCmdFactory", true, Monitor::_safepoint_check_never);
  bool DCmdFactory::_send_jmx_notification = false;
  
  DCmdFactory* DCmdFactory::factory(DCmdSource source, const char* name, size_t len) {
!   MutexLockerEx ml(_dcmdFactory_lock, Mutex::_no_safepoint_check_flag);
    DCmdFactory* factory = _DCmdFactoryList;
    while (factory != NULL) {
      if (strlen(factory->name()) == len &&
          strncmp(name, factory->name(), len) == 0) {
        if(factory->export_flags() & source) {
--- 489,502 ----
              &args2,
              CHECK);
    }
  }
  
  bool DCmdFactory::_send_jmx_notification = false;
  
  DCmdFactory* DCmdFactory::factory(DCmdSource source, const char* name, size_t len) {
!   MutexLockerEx ml(DCmdFactory_lock, Mutex::_no_safepoint_check_flag);
    DCmdFactory* factory = _DCmdFactoryList;
    while (factory != NULL) {
      if (strlen(factory->name()) == len &&
          strncmp(name, factory->name(), len) == 0) {
        if(factory->export_flags() & source) {
*** 510,520 ****
    }
    return NULL;
  }
  
  int DCmdFactory::register_DCmdFactory(DCmdFactory* factory) {
!   MutexLockerEx ml(_dcmdFactory_lock, Mutex::_no_safepoint_check_flag);
    factory->_next = _DCmdFactoryList;
    _DCmdFactoryList = factory;
    if (_send_jmx_notification && !factory->_hidden
        && (factory->_export_flags & DCmd_Source_MBean)) {
      DCmdFactory::push_jmx_notification_request();
--- 509,519 ----
    }
    return NULL;
  }
  
  int DCmdFactory::register_DCmdFactory(DCmdFactory* factory) {
!   MutexLockerEx ml(DCmdFactory_lock, Mutex::_no_safepoint_check_flag);
    factory->_next = _DCmdFactoryList;
    _DCmdFactoryList = factory;
    if (_send_jmx_notification && !factory->_hidden
        && (factory->_export_flags & DCmd_Source_MBean)) {
      DCmdFactory::push_jmx_notification_request();
*** 535,545 ****
    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
               "Unknown diagnostic command");
  }
  
  GrowableArray<const char*>* DCmdFactory::DCmd_list(DCmdSource source) {
!   MutexLockerEx ml(_dcmdFactory_lock, Mutex::_no_safepoint_check_flag);
    GrowableArray<const char*>* array = new GrowableArray<const char*>();
    DCmdFactory* factory = _DCmdFactoryList;
    while (factory != NULL) {
      if (!factory->is_hidden() && (factory->export_flags() & source)) {
        array->append(factory->name());
--- 534,544 ----
    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
               "Unknown diagnostic command");
  }
  
  GrowableArray<const char*>* DCmdFactory::DCmd_list(DCmdSource source) {
!   MutexLockerEx ml(DCmdFactory_lock, Mutex::_no_safepoint_check_flag);
    GrowableArray<const char*>* array = new GrowableArray<const char*>();
    DCmdFactory* factory = _DCmdFactoryList;
    while (factory != NULL) {
      if (!factory->is_hidden() && (factory->export_flags() & source)) {
        array->append(factory->name());
*** 548,558 ****
    }
    return array;
  }
  
  GrowableArray<DCmdInfo*>* DCmdFactory::DCmdInfo_list(DCmdSource source ) {
!   MutexLockerEx ml(_dcmdFactory_lock, Mutex::_no_safepoint_check_flag);
    GrowableArray<DCmdInfo*>* array = new GrowableArray<DCmdInfo*>();
    DCmdFactory* factory = _DCmdFactoryList;
    while (factory != NULL) {
      if (!factory->is_hidden() && (factory->export_flags() & source)) {
        array->append(new DCmdInfo(factory->name(),
--- 547,557 ----
    }
    return array;
  }
  
  GrowableArray<DCmdInfo*>* DCmdFactory::DCmdInfo_list(DCmdSource source ) {
!   MutexLockerEx ml(DCmdFactory_lock, Mutex::_no_safepoint_check_flag);
    GrowableArray<DCmdInfo*>* array = new GrowableArray<DCmdInfo*>();
    DCmdFactory* factory = _DCmdFactoryList;
    while (factory != NULL) {
      if (!factory->is_hidden() && (factory->export_flags() & source)) {
        array->append(new DCmdInfo(factory->name(),