diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/LocalHostResourceManagerLinux.java | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/LocalHostResourceManagerLinux.java b/src/main/java/com/google/devtools/build/lib/actions/LocalHostResourceManagerLinux.java index b889742bf5..19d0208dd2 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/LocalHostResourceManagerLinux.java +++ b/src/main/java/com/google/devtools/build/lib/actions/LocalHostResourceManagerLinux.java @@ -20,8 +20,6 @@ import com.google.devtools.build.lib.unix.ProcMeminfoParser; import java.io.File; import java.io.IOException; import java.nio.charset.Charset; -import java.util.HashSet; -import java.util.Set; /** * This class estimates the local host's resource capacity for Linux. @@ -38,11 +36,6 @@ public class LocalHostResourceManagerLinux { return getLogicalCpuCountHelper(content); } - private static int getPhysicalCpuCount(int logicalCpuCount) throws IOException { - String content = getCpuInfoContent(); - return getPhysicalCpuCountHelper(logicalCpuCount, content); - } - private static double getMemoryInMb() throws IOException, ProcMeminfoParser.KeywordNotFoundException { return getMemoryInMbHelper(MEM_INFO_FILE); @@ -51,14 +44,11 @@ public class LocalHostResourceManagerLinux { public static ResourceSet getLocalHostResources() { try { int logicalCpuCount = getLogicalCpuCount(); - int physicalCpuCount = getPhysicalCpuCount(logicalCpuCount); double ramMb = getMemoryInMb(); - boolean hyperthreading = (logicalCpuCount != physicalCpuCount); - final double EFFECTIVE_CPUS_PER_HYPERTHREADED_CPU = 0.6; return ResourceSet.create( ramMb, - logicalCpuCount * (hyperthreading ? EFFECTIVE_CPUS_PER_HYPERTHREADED_CPU : 1.0), + logicalCpuCount, 1.0, Integer.MAX_VALUE); } catch (IOException | ProcMeminfoParser.KeywordNotFoundException e) { @@ -94,36 +84,6 @@ public class LocalHostResourceManagerLinux { return count; } - public static int getPhysicalCpuCountHelper(int logicalCpuCount, String content) - throws IOException { - // CPU count - Iterable<String> lines = NEWLINE_SPLITTER.split(content); - Set<String> uniq = new HashSet<>(); - for (String line : lines) { - if (line.startsWith("physical id")) { - uniq.add(line); - } - } - int cpuCount = uniq.size(); - if (cpuCount == 0) { - cpuCount = logicalCpuCount; - } - - // core per CPU - uniq = new HashSet<>(); - for (String line : lines) { - if (line.startsWith("core id")) { - uniq.add(line); - } - } - int coresPerCpu = uniq.size(); - if (coresPerCpu == 0) { - coresPerCpu = 1; - } - - return cpuCount * coresPerCpu; - } - public static double getMemoryInMbHelper(String memInfoFileName) throws IOException, ProcMeminfoParser.KeywordNotFoundException { ProcMeminfoParser memInfo = new ProcMeminfoParser(memInfoFileName); |