src/share/vm/services/management.cpp

*** 70,85 ****
--- 70,95 ----
  
  jmmOptionalSupport Management::_optional_support = {0};
  TimeStamp Management::_stamp;
  
  void management_init() {
+ #if INCLUDE_MANAGEMENT
    Management::init();
    ThreadService::init();
    RuntimeService::init();
    ClassLoadingService::init();
+ #else
+   ThreadService::init();
+   // Make sure the VM version is initialized
+   // This is normally called by RuntimeService::init().
+   // Since that is conditionalized out, we need to call it here.
+   Abstract_VM_Version::initialize();
+ #endif // INCLUDE_MANAGEMENT
  }
  
+ #if INCLUDE_MANAGEMENT
+ 
  void Management::init() {
    EXCEPTION_MARK;
  
    // These counters are for java.lang.management API support.
    // They are created even if -XX:-UsePerfData is set and in
*** 110,123 ****
      _optional_support.isOtherThreadCpuTimeSupported = 0;
    }
  
    _optional_support.isBootClassPathSupported = 1;
    _optional_support.isObjectMonitorUsageSupported = 1;
! #ifndef SERVICES_KERNEL
    // This depends on the heap inspector
    _optional_support.isSynchronizerUsageSupported = 1;
! #endif // SERVICES_KERNEL
    _optional_support.isThreadAllocatedMemorySupported = 1;
  
    // Registration of the diagnostic commands
    DCmdRegistrant::register_dcmds();
    DCmdRegistrant::register_dcmds_ext();
--- 120,133 ----
      _optional_support.isOtherThreadCpuTimeSupported = 0;
    }
  
    _optional_support.isBootClassPathSupported = 1;
    _optional_support.isObjectMonitorUsageSupported = 1;
! #if INCLUDE_SERVICES
    // This depends on the heap inspector
    _optional_support.isSynchronizerUsageSupported = 1;
! #endif // INCLUDE_SERVICES
    _optional_support.isThreadAllocatedMemorySupported = 1;
  
    // Registration of the diagnostic commands
    DCmdRegistrant::register_dcmds();
    DCmdRegistrant::register_dcmds_ext();
*** 2084,2094 ****
    mgr->set_notification_enabled(enabled?true:false);
  JVM_END
  
  // Dump heap - Returns 0 if succeeds.
  JVM_ENTRY(jint, jmm_DumpHeap0(JNIEnv *env, jstring outputfile, jboolean live))
! #ifndef SERVICES_KERNEL
    ResourceMark rm(THREAD);
    oop on = JNIHandles::resolve_external_guard(outputfile);
    if (on == NULL) {
      THROW_MSG_(vmSymbols::java_lang_NullPointerException(),
                 "Output file name cannot be null.", -1);
--- 2094,2104 ----
    mgr->set_notification_enabled(enabled?true:false);
  JVM_END
  
  // Dump heap - Returns 0 if succeeds.
  JVM_ENTRY(jint, jmm_DumpHeap0(JNIEnv *env, jstring outputfile, jboolean live))
! #if INCLUDE_SERVICES
    ResourceMark rm(THREAD);
    oop on = JNIHandles::resolve_external_guard(outputfile);
    if (on == NULL) {
      THROW_MSG_(vmSymbols::java_lang_NullPointerException(),
                 "Output file name cannot be null.", -1);
*** 2102,2114 ****
    if (dumper.dump(name) != 0) {
      const char* errmsg = dumper.error_as_C_string();
      THROW_MSG_(vmSymbols::java_io_IOException(), errmsg, -1);
    }
    return 0;
! #else  // SERVICES_KERNEL
    return -1;
! #endif // SERVICES_KERNEL
  JVM_END
  
  JVM_ENTRY(jobjectArray, jmm_GetDiagnosticCommands(JNIEnv *env))
    ResourceMark rm(THREAD);
    GrowableArray<const char *>* dcmd_list = DCmdFactory::DCmd_list();
--- 2112,2124 ----
    if (dumper.dump(name) != 0) {
      const char* errmsg = dumper.error_as_C_string();
      THROW_MSG_(vmSymbols::java_io_IOException(), errmsg, -1);
    }
    return 0;
! #else  // INCLUDE_SERVICES
    return -1;
! #endif // INCLUDE_SERVICES
  JVM_END
  
  JVM_ENTRY(jobjectArray, jmm_GetDiagnosticCommands(JNIEnv *env))
    ResourceMark rm(THREAD);
    GrowableArray<const char *>* dcmd_list = DCmdFactory::DCmd_list();
*** 2271,2282 ****
--- 2281,2295 ----
    jmm_GetDiagnosticCommands,
    jmm_GetDiagnosticCommandInfo,
    jmm_GetDiagnosticCommandArgumentsInfo,
    jmm_ExecuteDiagnosticCommand
  };
+ #endif // INCLUDE_MANAGEMENT
  
  void* Management::get_jmm_interface(int version) {
+ #if INCLUDE_MANAGEMENT
    if (version == JMM_VERSION_1_0) {
      return (void*) &jmm_interface;
    }
+ #endif // INCLUDE_MANAGEMENT
    return NULL;
  }