diff options
author | jprovino <none@none> | 2012-10-10 14:35:58 -0400 |
---|---|---|
committer | jprovino <none@none> | 2012-10-10 14:35:58 -0400 |
commit | 50a8701bdde5aab33fe1ab09e5fbe4655540ee40 (patch) | |
tree | 4ef9d5e32880555cbde688f242f0d4301d7a597c /src/share/vm/services/management.cpp | |
parent | 60358ae2bcd95c00730bde44f23206c48dbe5b70 (diff) |
7189254: Change makefiles for more flexibility to override defaults
Summary: Change makefiles so that targets and parameters can be overridden by alternate makefiles.
Reviewed-by: dholmes, coleenp
Diffstat (limited to 'src/share/vm/services/management.cpp')
-rw-r--r-- | src/share/vm/services/management.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/share/vm/services/management.cpp b/src/share/vm/services/management.cpp index f73f113da..a2b5a0d39 100644 --- a/src/share/vm/services/management.cpp +++ b/src/share/vm/services/management.cpp @@ -72,12 +72,22 @@ 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; @@ -112,10 +122,10 @@ void Management::init() { _optional_support.isBootClassPathSupported = 1; _optional_support.isObjectMonitorUsageSupported = 1; -#ifndef SERVICES_KERNEL +#if INCLUDE_SERVICES // This depends on the heap inspector _optional_support.isSynchronizerUsageSupported = 1; -#endif // SERVICES_KERNEL +#endif // INCLUDE_SERVICES _optional_support.isThreadAllocatedMemorySupported = 1; // Registration of the diagnostic commands @@ -2108,7 +2118,7 @@ JVM_END // Dump heap - Returns 0 if succeeds. JVM_ENTRY(jint, jmm_DumpHeap0(JNIEnv *env, jstring outputfile, jboolean live)) -#ifndef SERVICES_KERNEL +#if INCLUDE_SERVICES ResourceMark rm(THREAD); oop on = JNIHandles::resolve_external_guard(outputfile); if (on == NULL) { @@ -2126,9 +2136,9 @@ JVM_ENTRY(jint, jmm_DumpHeap0(JNIEnv *env, jstring outputfile, jboolean live)) THROW_MSG_(vmSymbols::java_io_IOException(), errmsg, -1); } return 0; -#else // SERVICES_KERNEL +#else // INCLUDE_SERVICES return -1; -#endif // SERVICES_KERNEL +#endif // INCLUDE_SERVICES JVM_END JVM_ENTRY(jobjectArray, jmm_GetDiagnosticCommands(JNIEnv *env)) @@ -2295,10 +2305,13 @@ const struct jmmInterface_1_ jmm_interface = { 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; } |