changeset 29667:c3348fd718cc

Merge
author amurillo
date Thu, 26 Mar 2015 13:54:09 -0700
parents 78c47f0002c3 888a845d7bdc
children a15171ab2650 1b49d946a1c8 2dd31ea5f49c
files
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/test/lib/sun/hotspot/WhiteBox.java	Thu Mar 26 16:17:30 2015 +0100
+++ b/test/lib/sun/hotspot/WhiteBox.java	Thu Mar 26 13:54:09 2015 -0700
@@ -24,6 +24,7 @@
 
 package sun.hotspot;
 
+import java.lang.management.MemoryUsage;
 import java.lang.reflect.Executable;
 import java.util.Arrays;
 import java.util.List;
@@ -95,8 +96,10 @@
   // G1
   public native boolean g1InConcurrentMark();
   public native boolean g1IsHumongous(Object o);
+  public native long    g1NumMaxRegions();
   public native long    g1NumFreeRegions();
   public native int     g1RegionSize();
+  public native MemoryUsage g1AuxiliaryMemoryUsage();
   public native Object[]    parseCommandLine(String commandline, char delim, DiagnosticCommand[] args);
 
   // NMT