jdk.diff

diff -r 9b8c96f96a0f make/java/management/mapfile-vers
--- a/make/java/management/mapfile-vers	Mon Jun 27 13:21:34 2011 -0700
+++ b/make/java/management/mapfile-vers	Mon Jul 08 14:12:26 2013 -0700
@@ -61,6 +61,7 @@
 	    Java_sun_management_MemoryImpl_getMemoryUsage0;
 	    Java_sun_management_MemoryImpl_setVerboseGC;
 	    Java_sun_management_MemoryManagerImpl_getMemoryPools0;
+	    Java_sun_management_MemoryManagerImpl_getAllocationRate0;
 	    Java_sun_management_MemoryPoolImpl_getCollectionUsage0;
 	    Java_sun_management_MemoryPoolImpl_getMemoryManagers0;
 	    Java_sun_management_MemoryPoolImpl_getPeakUsage0;
diff -r 9b8c96f96a0f src/share/classes/java/lang/management/MemoryManagerMXBean.java
--- a/src/share/classes/java/lang/management/MemoryManagerMXBean.java	Mon Jun 27 13:21:34 2011 -0700
+++ b/src/share/classes/java/lang/management/MemoryManagerMXBean.java	Mon Jul 08 14:12:26 2013 -0700
@@ -85,4 +85,6 @@
      * the name of a memory pool that this memory manager manages.
      */
     public String[] getMemoryPoolNames();
+
+    public double getAllocationRate();
 }
diff -r 9b8c96f96a0f src/share/classes/sun/management/MemoryManagerImpl.java
--- a/src/share/classes/sun/management/MemoryManagerImpl.java	Mon Jun 27 13:21:34 2011 -0700
+++ b/src/share/classes/sun/management/MemoryManagerImpl.java	Mon Jul 08 14:12:26 2013 -0700
@@ -88,6 +88,12 @@
         return notifInfo;
     }
 
+    public synchronized double getAllocationRate() {
+        return getAllocationRate0();
+    }
+
+    private native double getAllocationRate0();
+
     public ObjectName getObjectName() {
         return Util.newObjectName(ManagementFactory.MEMORY_MANAGER_MXBEAN_DOMAIN_TYPE, getName());
     }
diff -r 9b8c96f96a0f src/share/javavm/export/jmm.h
--- a/src/share/javavm/export/jmm.h	Mon Jun 27 13:21:34 2011 -0700
+++ b/src/share/javavm/export/jmm.h	Mon Jul 08 14:12:26 2013 -0700
@@ -209,6 +209,7 @@
   jobjectArray (JNICALL *GetInputArgumentArray)  (JNIEnv *env);
 
   jobjectArray (JNICALL *GetMemoryPools)         (JNIEnv* env, jobject mgr);
+  jdouble      (JNICALL *GetAllocationRate)      (JNIEnv* env, jobject mgr);
 
   jobjectArray (JNICALL *GetMemoryManagers)      (JNIEnv* env, jobject pool);
 
diff -r 9b8c96f96a0f src/share/native/sun/management/MemoryManagerImpl.c
--- a/src/share/native/sun/management/MemoryManagerImpl.c	Mon Jun 27 13:21:34 2011 -0700
+++ b/src/share/native/sun/management/MemoryManagerImpl.c	Mon Jul 08 14:12:26 2013 -0700
@@ -35,3 +35,9 @@
     }
     return pools;
 }
+
+JNIEXPORT jdouble JNICALL Java_sun_management_MemoryManagerImpl_getAllocationRate0
+  (JNIEnv *env, jobject mgr) {
+    return jmm_interface->GetAllocationRate(env, mgr);
+}
+