Mercurial > hg > truffle

changeset 14189:1a899ea6b7ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8031305: (hotspot) com.sun.management.VMOption is missing the ATTACH_ON_DEMAND origin Reviewed-by: jbachorik, mchung, dholmes
author sla
date Tue, 07 Jan 2014 12:32:57 +0100
parents 29985fccf378
children ce86c36b8921
files src/share/vm/services/jmm.h src/share/vm/services/management.cpp
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/services/jmm.h	Tue Jan 07 10:50:28 2014 +0100
+++ b/src/share/vm/services/jmm.h	Tue Jan 07 12:32:57 2014 +0100
@@ -153,6 +153,7 @@
   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_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 */
 } jmmVMGlobalOrigin;
 
--- a/src/share/vm/services/management.cpp	Tue Jan 07 10:50:28 2014 +0100
+++ b/src/share/vm/services/management.cpp	Tue Jan 07 12:32:57 2014 +0100
@@ -1724,6 +1724,9 @@
     case Flag::ERGONOMIC:
       global->origin = JMM_VMGLOBAL_ORIGIN_ERGONOMIC;
       break;
+    case Flag::ATTACH_ON_DEMAND:
+      global->origin = JMM_VMGLOBAL_ORIGIN_ATTACH_ON_DEMAND;
+      break;
     default:
       global->origin = JMM_VMGLOBAL_ORIGIN_OTHER;
   }