diff options
Diffstat (limited to 'community/openjdk8/icedtea-JDK-6515172_0_revert-jdk8-version.patch')
| -rw-r--r-- | community/openjdk8/icedtea-JDK-6515172_0_revert-jdk8-version.patch | 182 |
1 files changed, 182 insertions, 0 deletions
diff --git a/community/openjdk8/icedtea-JDK-6515172_0_revert-jdk8-version.patch b/community/openjdk8/icedtea-JDK-6515172_0_revert-jdk8-version.patch new file mode 100644 index 00000000000..24366045419 --- /dev/null +++ b/community/openjdk8/icedtea-JDK-6515172_0_revert-jdk8-version.patch @@ -0,0 +1,182 @@ +From 05a1b8a93c790026dbc8785903ceaeba1396e708 Mon Sep 17 00:00:00 2001 +From: Shafi Ahmad <shshahma@openjdk.org> +Date: Thu, 22 Sep 2016 02:04:40 -0700 +Subject: [PATCH] 6515172: Runtime.availableProcessors() ignores Linux taskset + command + +Extract processor count from sched_getaffinity mask + +Revert patch created by Simon Frankenberger <simon-alpine@fraho.eu> + +diff --git a/hotspot/src/os/linux/vm/globals_linux.hpp b/hotspot/src/os/linux/vm/globals_linux.hpp +--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp +@@ -107,14 +107,6 @@ + + PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC + +-#ifndef _GNU_SOURCE +- #define _GNU_SOURCE +- #include <sched.h> +- #undef _GNU_SOURCE +-#else +- #include <sched.h> +-#endif +- + // if RUSAGE_THREAD for getrusage() has not been defined, do it here. The code calling + // getrusage() is prepared to handle the associated failure. + #ifndef RUSAGE_THREAD +@@ -5331,42 +5323,12 @@ + } + }; + +-static int os_cpu_count(const cpu_set_t* cpus) { +- int count = 0; +- // only look up to the number of configured processors +- for (int i = 0; i < os::processor_count(); i++) { +- if (CPU_ISSET(i, cpus)) { +- count++; +- } +- } +- return count; +-} +- +-// Get the current number of available processors for this process. +-// This value can change at any time during a process's lifetime. +-// sched_getaffinity gives an accurate answer as it accounts for cpusets. +-// If anything goes wrong we fallback to returning the number of online +-// processors - which can be greater than the number available to the process. + int os::Linux::active_processor_count() { +- cpu_set_t cpus; // can represent at most 1024 (CPU_SETSIZE) processors +- int cpus_size = sizeof(cpu_set_t); +- int cpu_count = 0; +- +- // pid 0 means the current thread - which we have to assume represents the process +- if (sched_getaffinity(0, cpus_size, &cpus) == 0) { +- cpu_count = os_cpu_count(&cpus); +- if (PrintActiveCpus) { +- tty->print_cr("active_processor_count: sched_getaffinity processor count: %d", cpu_count); +- } +- } +- else { +- cpu_count = ::sysconf(_SC_NPROCESSORS_ONLN); +- warning("sched_getaffinity failed (%s)- using online processor count (%d) " +- "which may exceed available processors", strerror(errno), cpu_count); +- } +- +- assert(cpu_count > 0 && cpu_count <= os::processor_count(), "sanity check"); +- return cpu_count; ++ // Linux doesn't yet have a (official) notion of processor sets, ++ // so just return the number of online processors. ++ int online_cpus = ::sysconf(_SC_NPROCESSORS_ONLN); ++ assert(online_cpus > 0 && online_cpus <= processor_count(), "sanity check"); ++ return online_cpus; + } + + // Determine the active processor count from one of +--- openjdk/hotspot/test/runtime/os/AvailableProcessors.java ++++ /dev/null +@@ -1,103 +0,0 @@ +-/* +- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. +- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +- * +- * This code is free software; you can redistribute it and/or modify it +- * under the terms of the GNU General Public License version 2 only, as +- * published by the Free Software Foundation. +- * +- * This code is distributed in the hope that it will be useful, but WITHOUT +- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +- * version 2 for more details (a copy is included in the LICENSE file that +- * accompanied this code). +- * +- * You should have received a copy of the GNU General Public License version +- * 2 along with this work; if not, write to the Free Software Foundation, +- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +- * +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. +- */ +-import java.io.File; +-import com.oracle.java.testlibrary.ProcessTools; +-import com.oracle.java.testlibrary.OutputAnalyzer; +-import java.util.ArrayList; +- +-/* +- * @test +- * @bug 6515172 +- * @summary Check that availableProcessors reports the correct value when running in a cpuset on linux +- * @requires os.family == "linux" +- * @library /testlibrary +- * @build com.oracle.java.testlibrary.* +- * @run driver AvailableProcessors +- */ +-public class AvailableProcessors { +- +- static final String SUCCESS_STRING = "Found expected processors: "; +- +- public static void main(String[] args) throws Throwable { +- if (args.length > 0) +- checkProcessors(Integer.parseInt(args[0])); +- else { +- // run ourselves under different cpu configurations +- // using the taskset command +- String taskset; +- final String taskset1 = "/bin/taskset"; +- final String taskset2 = "/usr/bin/taskset"; +- if (new File(taskset1).exists()) +- taskset = taskset1; +- else if (new File(taskset2).exists()) +- taskset = taskset2; +- else { +- System.out.println("Skipping test: could not find taskset command"); +- return; +- } +- +- int available = Runtime.getRuntime().availableProcessors(); +- +- if (available == 1) { +- System.out.println("Skipping test: only one processor available"); +- return; +- } +- +- // Get the java command we want to execute +- // Enable logging for easier failure diagnosis +- ProcessBuilder master = +- ProcessTools.createJavaProcessBuilder(false, +- "-XX:+UnlockDiagnosticVMOptions", +- "-XX:+PrintActiveCpus", +- "AvailableProcessors"); +- +- int[] expected = new int[] { 1, available/2, available-1, available }; +- +- for (int i : expected) { +- System.out.println("Testing for " + i + " processors ..."); +- int max = i - 1; +- ArrayList<String> cmdline = new ArrayList<>(master.command()); +- // prepend taskset command +- cmdline.add(0, "0-" + max); +- cmdline.add(0, "-c"); +- cmdline.add(0, taskset); +- // append expected processor count +- cmdline.add(String.valueOf(i)); +- ProcessBuilder pb = new ProcessBuilder(cmdline); +- System.out.println("Final command line: " + +- ProcessTools.getCommandLine(pb)); +- OutputAnalyzer output = ProcessTools.executeProcess(pb); +- output.shouldContain(SUCCESS_STRING); +- } +- } +- } +- +- static void checkProcessors(int expected) { +- int available = Runtime.getRuntime().availableProcessors(); +- if (available != expected) +- throw new Error("Expected " + expected + " processors, but found " +- + available); +- else +- System.out.println(SUCCESS_STRING + available); +- } +-} |