Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 57 additions & 5 deletions src/main/java/net/vulkanmod/vulkan/SystemInfo.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,64 @@
package net.vulkanmod.vulkan;

import oshi.hardware.CentralProcessor;
import net.vulkanmod.Initializer;
import java.io.*;
import java.nio.file.*;
import java.util.*;

public class SystemInfo {
public static final String cpuInfo;
private static final String PROC_CPUINFO = "/proc/cpuinfo";
private static final String SOC_MANUFACTURER_PROP = "/system/bin/getprop ro.soc.manufacturer";
private static final String SOC_MODEL_PROP = "/system/bin/getprop ro.soc.model";

public static final String cpuInfo = getCPUNameSafely();

static {
CentralProcessor centralProcessor = new oshi.SystemInfo().getHardware().getProcessor();
cpuInfo = String.format("%s", centralProcessor.getProcessorIdentifier().getName()).replaceAll("\\s+", " ");
public static String getCPUNameSafely() {
return Optional.ofNullable(getCPUNameFromProp())
.orElseGet(() -> Optional.ofNullable(getCPUNameFromProc())
.orElse("Unknown CPU"));
}

private static String getCPUNameFromProc() {
try {
return Files.lines(Paths.get(PROC_CPUINFO))
.filter(line -> line.startsWith("Hardware") || line.startsWith("model name"))
.findFirst()
.map(line -> {
String value = line.split(":", 2)[1].strip();
return line.startsWith("Hardware") ? value + " (SoC)" : value;
}).orElse(null);
} catch (IOException e) {
Initializer.LOGGER.warn("Failed to read CPU info from proc", e);
return null;
}
}

private static String getCPUNameFromProp() {
String manufacturer = executeCommand(SOC_MANUFACTURER_PROP);
String model = executeCommand(SOC_MODEL_PROP);

if (manufacturer == null) return model != null ? model : null;
else return model != null ? manufacturer + " " + model
: "A " + manufacturer + " CPU";
}

private static String executeCommand(String command) {
try {
Process process = new ProcessBuilder(command.split(" ")).start();
try (BufferedReader reader = new BufferedReader(
new InputStreamReader(process.getInputStream()))) {

if (process.waitFor() != 0) {
Initializer.LOGGER.warn("Command failed: " + command);
return null;
}

return reader.readLine();
}
} catch (IOException | InterruptedException e) {
Initializer.LOGGER.warn("Failed to execute command: " + command, e);
Thread.currentThread().interrupt();
return null;
}
}
}