mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-26 22:10:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes?

Browse Source
This commit is contained in:
RePixelatedMC committed 2023-10-22 09:20:13 +02:00
1 parent 593e96a31a
commit 3bca1f5304
1 file changed
+25 -13
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/volmit/iris/core/tools/IrisBenchmarking.java
+25 -13
View File
@@ -50,9 +50,9 @@ public class IrisBenchmarking {
static int currentTasks = 0; static int currentTasks = 0;
static double WindowsCPUCompression; static double WindowsCPUCompression;
static double WindowsCPUEncryption; static double WindowsCPUEncryption;
static double WindowsCPUVistaCompression;
static double WindowsCPUCSHA1; static double WindowsCPUCSHA1;
static double elapsedTimeNs; static double elapsedTimeNs;
static boolean Winsat = false;
static boolean WindowsDiskSpeed = false; static boolean WindowsDiskSpeed = false;
public static boolean inProgress = false; public static boolean inProgress = false;
// Good enough for now. . . // Good enough for now. . .
@@ -88,14 +88,17 @@ public class IrisBenchmarking {
}).thenRun(() -> { }).thenRun(() -> {
BenchmarksCompleted++; BenchmarksCompleted++;
if (ServerOS.contains("Windows") && isRunningAsAdmin()) { if (ServerOS.contains("Windows") && isRunningAsAdmin()) {
Winsat = true;
WindowsCpuSpeedTest(); WindowsCpuSpeedTest();
} else { } else {
Iris.info("Skipping:" + C.BLUE + " Windows System Assessment Tool Benchmarks"); Iris.info("Skipping:" + C.BLUE + " Windows System Assessment Tool Benchmarks");
if (ServerOS.contains("Windows")) { if (!ServerOS.contains("Windows")) {
Iris.info("Required Software:" + C.BLUE +" Windows"); Iris.info("Required Software:" + C.BLUE +" Windows");
BenchmarksTotal = 6;
} }
if (isRunningAsAdmin()){ if (!isRunningAsAdmin()){
Iris.info( C.RED + "Elevated privileges missing"); Iris.info( C.RED + "ERROR: " + C.DARK_RED +"Elevated privileges missing");
BenchmarksTotal = 6;
} }
} }
@@ -193,11 +196,13 @@ public class IrisBenchmarking {
Iris.info("- Used Ram: " + usedMemoryMB + " MB"); Iris.info("- Used Ram: " + usedMemoryMB + " MB");
Iris.info("- Total Process Ram: " + C.BLUE + getMaxMemoryUsage() + " MB"); Iris.info("- Total Process Ram: " + C.BLUE + getMaxMemoryUsage() + " MB");
Iris.info("- Total Paging Size: " + totalPageSize + " MB"); Iris.info("- Total Paging Size: " + totalPageSize + " MB");
Iris.info(C.BLUE + "Windows System Assessment Tool: "); if (Winsat) {
Iris.info("- CPU LZW Compression:" + C.BLUE + formatDouble(WindowsCPUCompression) + " MB/s"); Iris.info(C.BLUE + "Windows System Assessment Tool: ");
Iris.info("- CPU AES256 Encryption: " + C.BLUE + formatDouble(WindowsCPUEncryption) + " MB/s"); Iris.info("- CPU LZW Compression:" + C.BLUE + formatDouble(WindowsCPUCompression) + " MB/s");
Iris.info("- CPU SHA1 Hash: " + C.BLUE + formatDouble(WindowsCPUCSHA1) + " MB/s"); Iris.info("- CPU AES256 Encryption: " + C.BLUE + formatDouble(WindowsCPUEncryption) + " MB/s");
Iris.info("Duration: " + roundToTwoDecimalPlaces(elapsedTimeNs) + " Seconds"); Iris.info("- CPU SHA1 Hash: " + C.BLUE + formatDouble(WindowsCPUCSHA1) + " MB/s");
Iris.info("Duration: " + roundToTwoDecimalPlaces(elapsedTimeNs) + " Seconds");
}
} }
@@ -218,10 +223,16 @@ public class IrisBenchmarking {
} }
public static boolean isRunningAsAdmin() { public static boolean isRunningAsAdmin() {
if (ServerOS.contains("Windows")){ if (ServerOS.contains("Windows")) {
try {
Process process = Runtime.getRuntime().exec("winsat disk");
process.waitFor();
return process.exitValue() == 0;
} catch (IOException | InterruptedException e) {
// Handle exceptions as needed
}
} }
return true; return false; // Default to false if checks fail
} }
public static String getCPUModel() { public static String getCPUModel() {
@@ -248,7 +259,8 @@ public class IrisBenchmarking {
} }
public static void warningFallback() { public static void warningFallback() {
Iris.info(C.RED + "Using the FALLBACK method for " + C.DARK_RED + currentRunning + C.RED + " due to compatibility issues. Please note that this may result in less accurate results."); Iris.info(C.RED + "Using the FALLBACK method due to compatibility issues. ");
Iris.info(C.RED + "Please note that this may result in less accurate results.");
} }
private static String formatDouble(double value) { private static String formatDouble(double value) {