From owner-svn-ports-head@freebsd.org Thu Sep 7 00:41:35 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 56D1EE1FFD5; Thu, 7 Sep 2017 00:41:35 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 335D26E77D; Thu, 7 Sep 2017 00:41:35 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v870fYBR040596; Thu, 7 Sep 2017 00:41:34 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v870fYHm040594; Thu, 7 Sep 2017 00:41:34 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201709070041.v870fYHm040594@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 7 Sep 2017 00:41:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449382 - head/java/openjdk8/files X-SVN-Group: ports-head X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: head/java/openjdk8/files X-SVN-Commit-Revision: 449382 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Sep 2017 00:41:35 -0000 Author: jkim Date: Thu Sep 7 00:41:34 2017 New Revision: 449382 URL: https://svnweb.freebsd.org/changeset/ports/449382 Log: Fix available memory calculation on head after r309017. Note PORTREVISION is not bumped because it only affects a kernel without "options COMPAT_FREEBSD11". Modified: head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp head/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c Modified: head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp ============================================================================== --- head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp Thu Sep 7 00:40:40 2017 (r449381) +++ head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp Thu Sep 7 00:41:34 2017 (r449382) @@ -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 Modified: head/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c ============================================================================== --- head/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c Thu Sep 7 00:40:40 2017 (r449381) +++ head/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c Thu Sep 7 00:41:34 2017 (r449382) @@ -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 -@@ -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_ }