archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8031305: (hotspot) com.sun.management.VMOption is missing the ATTACH_ON_DEMAND origin

Browse source 
Reviewed-by: jbachorik, mchung, dholmes
This commit is contained in:
Staffan Larsen 2014-01-07 12:32:57 +01:00
parent 3c425d407f
commit 3e537df17c
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hotspot/src/share/vm/services/jmm.h
View file

@ -153,6 +153,7 @@ typedef enum {
JMM_VMGLOBAL_ORIGIN_ENVIRON_VAR = 4, /* Set via environment variables */ JMM_VMGLOBAL_ORIGIN_ENVIRON_VAR = 4, /* Set via environment variables */
JMM_VMGLOBAL_ORIGIN_CONFIG_FILE = 5, /* Set via config file (such as .hotspotrc) */ JMM_VMGLOBAL_ORIGIN_CONFIG_FILE = 5, /* Set via config file (such as .hotspotrc) */
JMM_VMGLOBAL_ORIGIN_ERGONOMIC = 6, /* Set via ergonomic */ JMM_VMGLOBAL_ORIGIN_ERGONOMIC = 6, /* Set via ergonomic */
JMM_VMGLOBAL_ORIGIN_ATTACH_ON_DEMAND = 7, /* Set via attach */
JMM_VMGLOBAL_ORIGIN_OTHER = 99 /* Set via some other mechanism */ JMM_VMGLOBAL_ORIGIN_OTHER = 99 /* Set via some other mechanism */
} jmmVMGlobalOrigin; } jmmVMGlobalOrigin;

3
hotspot/src/share/vm/services/management.cpp
View file

@ -1724,6 +1724,9 @@ bool add_global_entry(JNIEnv* env, Handle name, jmmVMGlobal *global, Flag *flag,
case Flag::ERGONOMIC: case Flag::ERGONOMIC:
global->origin = JMM_VMGLOBAL_ORIGIN_ERGONOMIC; global->origin = JMM_VMGLOBAL_ORIGIN_ERGONOMIC;
break; break;
case Flag::ATTACH_ON_DEMAND:
global->origin = JMM_VMGLOBAL_ORIGIN_ATTACH_ON_DEMAND;
break;
default: default:
global->origin = JMM_VMGLOBAL_ORIGIN_OTHER; global->origin = JMM_VMGLOBAL_ORIGIN_OTHER;
} }