sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix available memory calculation on head after r309017.

Browse source 
Note PORTREVISION is not bumped because it only affects a kernel without
"options COMPAT_FREEBSD11".
This commit is contained in:
Jung-uk Kim 2017-09-07 00:41:34 +00:00
parent b3af4e6f63
commit 6ea79f805e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=449382
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp
View file

@ -1,6 +1,16 @@
--- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2016-06-01 20:57:38.276230000 -0500 --- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2017-09-06 22:12:44 UTC
+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2016-06-01 20:56:46.380667000 -0500 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
@@ -767,6 +767,11 @@ @@ -189,7 +189,9 @@ julong os::Bsd::available_memory() {
#ifdef __FreeBSD__
static const char *vm_stats[] = {
"vm.stats.vm.v_free_count",
+#if __FreeBSD_version < 1200016
"vm.stats.vm.v_cache_count",
+#endif
"vm.stats.vm.v_inactive_count"
};
size_t size;
@@ -775,6 +777,11 @@ static void *java_start(Thread *thread)
guarantee(unique_thread_id != 0, "unique thread id was not found"); guarantee(unique_thread_id != 0, "unique thread id was not found");
osthread->set_unique_thread_id(unique_thread_id); osthread->set_unique_thread_id(unique_thread_id);
#endif #endif
@ -12,7 +22,7 @@
// initialize signal mask for this thread // initialize signal mask for this thread
os::Bsd::hotspot_sigmask(thread); os::Bsd::hotspot_sigmask(thread);
@@ -930,6 +935,11 @@ @@ -938,6 +945,11 @@ bool os::create_attached_thread(JavaThre
guarantee(unique_thread_id != 0, "just checking"); guarantee(unique_thread_id != 0, "just checking");
osthread->set_unique_thread_id(unique_thread_id); osthread->set_unique_thread_id(unique_thread_id);
#endif #endif

14
java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c
View file

@ -1,6 +1,16 @@
--- jdk/src/solaris/native/sun/management/OperatingSystemImpl.c.orig 2015-12-10 18:40:39 UTC --- jdk/src/solaris/native/sun/management/OperatingSystemImpl.c.orig 2017-09-06 22:12:44 UTC
+++ jdk/src/solaris/native/sun/management/OperatingSystemImpl.c +++ jdk/src/solaris/native/sun/management/OperatingSystemImpl.c
@@ -435,11 +435,6 @@ Java_sun_management_OperatingSystemImpl_ @@ -368,7 +368,9 @@ Java_sun_management_OperatingSystemImpl_
#elif defined(__FreeBSD__)
static const char *vm_stats[] = {
"vm.stats.vm.v_free_count",
+#if __FreeBSD_version < 1200016
"vm.stats.vm.v_cache_count",
+#endif
/* "vm.stats.vm.v_inactive_count", */
NULL
};
@@ -435,11 +437,6 @@ Java_sun_management_OperatingSystemImpl_
} }