diff options
Diffstat (limited to 'java/openjdk8')
| -rw-r--r-- | java/openjdk8/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk8/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c | 90 |
3 files changed, 4 insertions, 94 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 85c0ae16a984..eaa3251c70f2 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -53,7 +53,7 @@ INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 462 +JDK_UPDATE_VERSION= 472 JDK_BUILD_NUMBER= 08 BSD_JDK_VERSION= 1 JTREG_VERSION= 4.1 diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo index 87c0b9931cf8..8d6a0c8321a7 100644 --- a/java/openjdk8/distinfo +++ b/java/openjdk8/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1753419636 +TIMESTAMP = 1762059364 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c SIZE (jtreg4.1-b08.tar.gz) = 683425 -SHA256 (battleblow-jdk8u-8.462.08.1-jdk8u462-b08.1_GH0.tar.gz) = ef956bdbeff27383434418f34d7af67e9f81a54e04bc6351b52616515de1054c -SIZE (battleblow-jdk8u-8.462.08.1-jdk8u462-b08.1_GH0.tar.gz) = 93417092 +SHA256 (battleblow-jdk8u-8.472.08.1-jdk8u472-b08.1_GH0.tar.gz) = a39ab04eed5289ff6934b87f5d981e6f005358cf22b2869a35dff77200c2707a +SIZE (battleblow-jdk8u-8.472.08.1-jdk8u472-b08.1_GH0.tar.gz) = 93406190 diff --git a/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c b/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c deleted file mode 100644 index c542431a3ca3..000000000000 --- a/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c +++ /dev/null @@ -1,90 +0,0 @@ ---- jdk/src/solaris/native/sun/management/OperatingSystemImpl.c.orig 2025-04-19 16:48:54 UTC -+++ jdk/src/solaris/native/sun/management/OperatingSystemImpl.c -@@ -57,6 +57,7 @@ - #include <stdlib.h> - #include <unistd.h> - #ifdef __FreeBSD__ -+#include <sys/user.h> - #include <vm/vm_param.h> - #endif - -@@ -266,23 +267,45 @@ Java_sun_management_OperatingSystemImpl_getCommittedVi - } - return t_info.virtual_size; - #elif defined(__FreeBSD__) -- FILE *fp; -- unsigned long end, start; -- jlong total = 0; -+ int mib[4]; -+ struct kinfo_vmentry *kve; -+ long total = 0; -+ size_t len = 0; -+ int error; -+ char *buf, *bp, *eb; - -- if ((fp = fopen("/proc/curproc/map", "r")) == NULL) { -- throw_internal_error(env, "Unable to open /proc/curproc/map"); -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_PROC; -+ mib[2] = KERN_PROC_VMMAP; -+ mib[3] = getpid(); -+ -+ error = sysctl(mib, 4, NULL, &len, NULL, 0); -+ if (error) { -+ throw_internal_error(env, "Cannot sysctl(kern.proc.vvmap)"); - return -1; - } - -- for (;;) { -- // Ignore everything except start and end entries -- if (fscanf(fp, "0x%lx 0x%lx %*[^\n]\n", &start, &end) != 2 || start > end) -- break; -- total += end - start; -+ len = len * 4 / 3; -+ buf = malloc(len); -+ if (buf == NULL) { -+ throw_internal_error(env, "Fail to allocate memory"); -+ return -1; - } -- -- fclose(fp); -+ error = sysctl(mib, 4, buf, &len, NULL, 0); -+ if (error) { -+ throw_internal_error(env, "Cannot sysctl(kern.proc.vvmap)"); -+ return -1; -+ } -+ bp = buf; -+ eb = buf + len; -+ while (bp < eb) { -+ kve = (struct kinfo_vmentry *)(uintptr_t)bp; -+ if (kve->kve_structsize == 0) -+ break; -+ bp += kve->kve_structsize; -+ total += kve->kve_end - kve->kve_start; -+ } -+ free(buf); - return total; - #else /* _ALLBSD_SOURCE */ - /* -@@ -486,6 +509,21 @@ Java_sun_management_OperatingSystemImpl_getOpenFileDes - return nfiles; - #elif defined(__OpenBSD__) - return getdtablecount(); -+#elif defined(__FreeBSD__) -+ int mib[4]; -+ int error; -+ int nfds; -+ size_t len; -+ -+ len = sizeof(nfds); -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_PROC; -+ mib[2] = KERN_PROC_NFDS; -+ mib[3] = 0; -+ -+ if (sysctl(mib, 4, &nfds, &len, NULL, 0) == -1) -+ return -1; -+ return nfds; - #else /* solaris/linux */ - DIR *dirp; - struct dirent dbuf; |