Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/services/management.cpp	Tue Oct 09 10:09:34 2012 -0700
     1.2 +++ b/src/share/vm/services/management.cpp	Fri Oct 12 10:49:39 2012 -0700
     1.3 @@ -72,12 +72,22 @@
     1.4  TimeStamp Management::_stamp;
     1.5  
     1.6  void management_init() {
     1.7 +#if INCLUDE_MANAGEMENT
     1.8    Management::init();
     1.9    ThreadService::init();
    1.10    RuntimeService::init();
    1.11    ClassLoadingService::init();
    1.12 +#else
    1.13 +  ThreadService::init();
    1.14 +  // Make sure the VM version is initialized
    1.15 +  // This is normally called by RuntimeService::init().
    1.16 +  // Since that is conditionalized out, we need to call it here.
    1.17 +  Abstract_VM_Version::initialize();
    1.18 +#endif // INCLUDE_MANAGEMENT
    1.19  }
    1.20  
    1.21 +#if INCLUDE_MANAGEMENT
    1.22 +
    1.23  void Management::init() {
    1.24    EXCEPTION_MARK;
    1.25  
    1.26 @@ -112,10 +122,10 @@
    1.27  
    1.28    _optional_support.isBootClassPathSupported = 1;
    1.29    _optional_support.isObjectMonitorUsageSupported = 1;
    1.30 -#ifndef SERVICES_KERNEL
    1.31 +#if INCLUDE_SERVICES
    1.32    // This depends on the heap inspector
    1.33    _optional_support.isSynchronizerUsageSupported = 1;
    1.34 -#endif // SERVICES_KERNEL
    1.35 +#endif // INCLUDE_SERVICES
    1.36    _optional_support.isThreadAllocatedMemorySupported = 1;
    1.37  
    1.38    // Registration of the diagnostic commands
    1.39 @@ -2108,7 +2118,7 @@
    1.40  
    1.41  // Dump heap - Returns 0 if succeeds.
    1.42  JVM_ENTRY(jint, jmm_DumpHeap0(JNIEnv *env, jstring outputfile, jboolean live))
    1.43 -#ifndef SERVICES_KERNEL
    1.44 +#if INCLUDE_SERVICES
    1.45    ResourceMark rm(THREAD);
    1.46    oop on = JNIHandles::resolve_external_guard(outputfile);
    1.47    if (on == NULL) {
    1.48 @@ -2126,9 +2136,9 @@
    1.49      THROW_MSG_(vmSymbols::java_io_IOException(), errmsg, -1);
    1.50    }
    1.51    return 0;
    1.52 -#else  // SERVICES_KERNEL
    1.53 +#else  // INCLUDE_SERVICES
    1.54    return -1;
    1.55 -#endif // SERVICES_KERNEL
    1.56 +#endif // INCLUDE_SERVICES
    1.57  JVM_END
    1.58  
    1.59  JVM_ENTRY(jobjectArray, jmm_GetDiagnosticCommands(JNIEnv *env))
    1.60 @@ -2295,10 +2305,13 @@
    1.61    jmm_GetDiagnosticCommandArgumentsInfo,
    1.62    jmm_ExecuteDiagnosticCommand
    1.63  };
    1.64 +#endif // INCLUDE_MANAGEMENT
    1.65  
    1.66  void* Management::get_jmm_interface(int version) {
    1.67 +#if INCLUDE_MANAGEMENT
    1.68    if (version == JMM_VERSION_1_0) {
    1.69      return (void*) &jmm_interface;
    1.70    }
    1.71 +#endif // INCLUDE_MANAGEMENT
    1.72    return NULL;
    1.73  }