diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-09-07 00:41:34 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-09-07 00:41:34 +0000 |
| commit | 6ea79f805eacaab7a530e2b74f77a2e5ee9341ab (patch) | |
| tree | a4b4ef1bc7d0f8d7900676fe09829acfcf7926d5 /java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp | |
| parent | Fix available memory calculation on head after r309017. (diff) | |
Fix available memory calculation on head after r309017.
Note PORTREVISION is not bumped because it only affects a kernel without
"options COMPAT_FREEBSD11".
Diffstat (limited to '')
| -rw-r--r-- | java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp b/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp index f66e7637372f..09594d524ca7 100644 --- a/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp +++ b/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp @@ -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 2016-06-01 20:56:46.380667000 -0500 -@@ -767,6 +767,11 @@ +--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2017-09-06 22:12:44 UTC ++++ hotspot/src/os/bsd/vm/os_bsd.cpp +@@ -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"); osthread->set_unique_thread_id(unique_thread_id); #endif @@ -12,7 +22,7 @@ // initialize signal mask for this 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"); osthread->set_unique_thread_id(unique_thread_id); #endif |