Merge
authoramurillo
Thu, 26 Mar 2015 13:54:09 -0700
changeset 29667 c3348fd718cc
parent 29662 78c47f0002c3 (current diff)
parent 29666 888a845d7bdc (diff)
child 29668 a15171ab2650
child 30077 1b49d946a1c8
child 30081 2dd31ea5f49c
Merge
--- 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