Merge
authorjwilhelm
Mon, 16 Mar 2015 18:13:33 +0100
changeset 29665 b4ef48f9374f
parent 29442 e4b178a258da (current diff)
parent 29664 54de61fbee04 (diff)
child 29666 888a845d7bdc
Merge
test/lib/sun/hotspot/WhiteBox.java
--- a/test/lib/sun/hotspot/WhiteBox.java	Thu Mar 12 19:51:35 2015 -0700
+++ b/test/lib/sun/hotspot/WhiteBox.java	Mon Mar 16 18:13:33 2015 +0100
@@ -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