aboutsummaryrefslogtreecommitdiffstats
path: root/hotspot
diff options
context:
space:
mode:
Diffstat (limited to 'hotspot')
-rw-r--r--hotspot/.hg/patches/JVM_SetVmMemoryPressure.patch88
1 files changed, 51 insertions, 37 deletions
diff --git a/hotspot/.hg/patches/JVM_SetVmMemoryPressure.patch b/hotspot/.hg/patches/JVM_SetVmMemoryPressure.patch
index b82494f2..de1b01f0 100644
--- a/hotspot/.hg/patches/JVM_SetVmMemoryPressure.patch
+++ b/hotspot/.hg/patches/JVM_SetVmMemoryPressure.patch
@@ -1,90 +1,101 @@
# HG changeset patch
-# Parent 592f77165ec5790515d82fd1b9e02cd85b6d1946
+# Parent 8c8ce8112df68432b48c78539fa0bad4728a38a0
-diff -r 592f77165ec5 make/aix/makefiles/mapfile-vers-debug
---- a/make/aix/makefiles/mapfile-vers-debug Thu Jun 18 16:48:43 2015 -0700
-+++ b/make/aix/makefiles/mapfile-vers-debug Thu Jun 18 17:01:37 2015 -0700
-@@ -227,6 +227,7 @@
+diff -r 8c8ce8112df6 make/aix/makefiles/mapfile-vers-debug
+--- a/make/aix/makefiles/mapfile-vers-debug Mon Dec 07 17:11:22 2015 -0800
++++ b/make/aix/makefiles/mapfile-vers-debug Mon Dec 07 21:45:08 2015 -0800
+@@ -227,6 +227,8 @@
JVM_SetProtectionDomain;
JVM_SetSockOpt;
JVM_SetThreadPriority;
++ JVM_GetVmMemoryPressure;
+ JVM_SetVmMemoryPressure;
JVM_Sleep;
JVM_Socket;
JVM_SocketAvailable;
-diff -r 592f77165ec5 make/aix/makefiles/mapfile-vers-product
---- a/make/aix/makefiles/mapfile-vers-product Thu Jun 18 16:48:43 2015 -0700
-+++ b/make/aix/makefiles/mapfile-vers-product Thu Jun 18 17:01:37 2015 -0700
-@@ -225,6 +225,7 @@
+diff -r 8c8ce8112df6 make/aix/makefiles/mapfile-vers-product
+--- a/make/aix/makefiles/mapfile-vers-product Mon Dec 07 17:11:22 2015 -0800
++++ b/make/aix/makefiles/mapfile-vers-product Mon Dec 07 21:45:08 2015 -0800
+@@ -225,6 +225,8 @@
JVM_SetProtectionDomain;
JVM_SetSockOpt;
JVM_SetThreadPriority;
++ JVM_GetVmMemoryPressure;
+ JVM_SetVmMemoryPressure;
JVM_Sleep;
JVM_Socket;
JVM_SocketAvailable;
-diff -r 592f77165ec5 make/bsd/makefiles/mapfile-vers-debug
---- a/make/bsd/makefiles/mapfile-vers-debug Thu Jun 18 16:48:43 2015 -0700
-+++ b/make/bsd/makefiles/mapfile-vers-debug Thu Jun 18 17:01:37 2015 -0700
-@@ -228,6 +228,7 @@
+diff -r 8c8ce8112df6 make/bsd/makefiles/mapfile-vers-debug
+--- a/make/bsd/makefiles/mapfile-vers-debug Mon Dec 07 17:11:22 2015 -0800
++++ b/make/bsd/makefiles/mapfile-vers-debug Mon Dec 07 21:45:08 2015 -0800
+@@ -228,6 +228,8 @@
_JVM_SetPrimitiveArrayElement
_JVM_SetSockOpt
_JVM_SetThreadPriority
++ _JVM_GetVmMemoryPressure
+ _JVM_SetVmMemoryPressure
_JVM_Sleep
_JVM_Socket
_JVM_SocketAvailable
-diff -r 592f77165ec5 make/bsd/makefiles/mapfile-vers-product
---- a/make/bsd/makefiles/mapfile-vers-product Thu Jun 18 16:48:43 2015 -0700
-+++ b/make/bsd/makefiles/mapfile-vers-product Thu Jun 18 17:01:37 2015 -0700
-@@ -228,6 +228,7 @@
+diff -r 8c8ce8112df6 make/bsd/makefiles/mapfile-vers-product
+--- a/make/bsd/makefiles/mapfile-vers-product Mon Dec 07 17:11:22 2015 -0800
++++ b/make/bsd/makefiles/mapfile-vers-product Mon Dec 07 21:45:08 2015 -0800
+@@ -228,6 +228,8 @@
_JVM_SetPrimitiveArrayElement
_JVM_SetSockOpt
_JVM_SetThreadPriority
++ _JVM_GetVmMemoryPressure
+ _JVM_SetVmMemoryPressure
_JVM_Sleep
_JVM_Socket
_JVM_SocketAvailable
-diff -r 592f77165ec5 make/linux/makefiles/mapfile-vers-debug
---- a/make/linux/makefiles/mapfile-vers-debug Thu Jun 18 16:48:43 2015 -0700
-+++ b/make/linux/makefiles/mapfile-vers-debug Thu Jun 18 17:01:37 2015 -0700
-@@ -230,6 +230,7 @@
+diff -r 8c8ce8112df6 make/linux/makefiles/mapfile-vers-debug
+--- a/make/linux/makefiles/mapfile-vers-debug Mon Dec 07 17:11:22 2015 -0800
++++ b/make/linux/makefiles/mapfile-vers-debug Mon Dec 07 21:45:08 2015 -0800
+@@ -230,6 +230,8 @@
JVM_SetPrimitiveArrayElement;
JVM_SetSockOpt;
JVM_SetThreadPriority;
++ JVM_GetVmMemoryPressure;
+ JVM_SetVmMemoryPressure;
JVM_Sleep;
JVM_Socket;
JVM_SocketAvailable;
-diff -r 592f77165ec5 make/linux/makefiles/mapfile-vers-product
---- a/make/linux/makefiles/mapfile-vers-product Thu Jun 18 16:48:43 2015 -0700
-+++ b/make/linux/makefiles/mapfile-vers-product Thu Jun 18 17:01:37 2015 -0700
-@@ -230,6 +230,7 @@
+diff -r 8c8ce8112df6 make/linux/makefiles/mapfile-vers-product
+--- a/make/linux/makefiles/mapfile-vers-product Mon Dec 07 17:11:22 2015 -0800
++++ b/make/linux/makefiles/mapfile-vers-product Mon Dec 07 21:45:08 2015 -0800
+@@ -230,6 +230,8 @@
JVM_SetPrimitiveArrayElement;
JVM_SetSockOpt;
JVM_SetThreadPriority;
++ JVM_GetVmMemoryPressure;
+ JVM_SetVmMemoryPressure;
JVM_Sleep;
JVM_Socket;
JVM_SocketAvailable;
-diff -r 592f77165ec5 make/solaris/makefiles/mapfile-vers
---- a/make/solaris/makefiles/mapfile-vers Thu Jun 18 16:48:43 2015 -0700
-+++ b/make/solaris/makefiles/mapfile-vers Thu Jun 18 17:01:37 2015 -0700
-@@ -230,6 +230,7 @@
+diff -r 8c8ce8112df6 make/solaris/makefiles/mapfile-vers
+--- a/make/solaris/makefiles/mapfile-vers Mon Dec 07 17:11:22 2015 -0800
++++ b/make/solaris/makefiles/mapfile-vers Mon Dec 07 21:45:08 2015 -0800
+@@ -230,6 +230,8 @@
JVM_SetPrimitiveArrayElement;
JVM_SetSockOpt;
JVM_SetThreadPriority;
++ JVM_GetVmMemoryPressure;
+ JVM_SetVmMemoryPressure;
JVM_Sleep;
JVM_Socket;
JVM_SocketAvailable;
-diff -r 592f77165ec5 src/share/vm/prims/jvm.cpp
---- a/src/share/vm/prims/jvm.cpp Thu Jun 18 16:48:43 2015 -0700
-+++ b/src/share/vm/prims/jvm.cpp Thu Jun 18 17:01:37 2015 -0700
-@@ -4302,6 +4302,10 @@
+diff -r 8c8ce8112df6 src/share/vm/prims/jvm.cpp
+--- a/src/share/vm/prims/jvm.cpp Mon Dec 07 17:11:22 2015 -0800
++++ b/src/share/vm/prims/jvm.cpp Mon Dec 07 21:45:08 2015 -0800
+@@ -4305,6 +4305,14 @@
return Management::get_jmm_interface(version);
JVM_END
++JVM_ENTRY_NO_ENV(jint, JVM_GetVmMemoryPressure())
++ // Do nothing, this function is only to make management.dll happy
++JVM_END
++
+JVM_ENTRY_NO_ENV(void, JVM_SetVmMemoryPressure(jint pressure))
+ // Do nothing, this function is only to make management.dll happy
+JVM_END
@@ -92,13 +103,16 @@ diff -r 592f77165ec5 src/share/vm/prims/jvm.cpp
// com.sun.tools.attach.VirtualMachine agent properties support
//
// Initialize the agent properties with the properties maintained in the VM
-diff -r 592f77165ec5 src/share/vm/prims/jvm.h
---- a/src/share/vm/prims/jvm.h Thu Jun 18 16:48:43 2015 -0700
-+++ b/src/share/vm/prims/jvm.h Thu Jun 18 17:01:37 2015 -0700
-@@ -1490,6 +1490,9 @@
+diff -r 8c8ce8112df6 src/share/vm/prims/jvm.h
+--- a/src/share/vm/prims/jvm.h Mon Dec 07 17:11:22 2015 -0800
++++ b/src/share/vm/prims/jvm.h Mon Dec 07 21:45:08 2015 -0800
+@@ -1490,6 +1490,12 @@
JNIEXPORT void* JNICALL
JVM_GetManagement(jint version);
++JNIEXPORT jint JNICALL
++JVM_GetVmMemoryPressure();
++
+JNIEXPORT void JNICALL
+JVM_SetVmMemoryPressure(jint pressure);
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 17:49:27 +0000