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

Merge remote-tracking branch 'pixeldev/Pixeldev' into Pixeldev

Browse Source
This commit is contained in:
CrazyDev22
2023-12-22 16:33:51 +01:00
parent a75348d3ee 0546caeb05
commit 5bc024a6ee
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/volmit/iris/Iris.java
+1 -2
View File
@@ -98,7 +98,6 @@ import java.util.Map;
import static com.volmit.iris.core.safeguard.IrisSafeguard.*; import static com.volmit.iris.core.safeguard.IrisSafeguard.*;
import static com.volmit.iris.core.safeguard.ServerBootSFG.passedserversoftware; import static com.volmit.iris.core.safeguard.ServerBootSFG.passedserversoftware;
import static com.volmit.iris.util.misc.getHardware.getCPUModel; import static com.volmit.iris.util.misc.getHardware.getCPUModel;
import static com.volmit.iris.util.misc.getHardware.getCPUThreads;
@SuppressWarnings("CanBeFinal") @SuppressWarnings("CanBeFinal")
public class Iris extends VolmitPlugin implements Listener { public class Iris extends VolmitPlugin implements Listener {
@@ -834,7 +833,7 @@ public class Iris extends VolmitPlugin implements Listener {
Iris.info("Server Cpu: " + C.DARK_RED + "Failed"); Iris.info("Server Cpu: " + C.DARK_RED + "Failed");
} }
Iris.info("Process Threads: " + getCPUThreads()); Iris.info("Process Threads: " + Runtime.getRuntime().availableProcessors());
Iris.info("Process Memory: " + getHardware.getProcessMemory() + " MB"); Iris.info("Process Memory: " + getHardware.getProcessMemory() + " MB");
Iris.info("Free DiskSpace: " + Form.ofSize(freeSpace.getFreeSpace(), 1024)); Iris.info("Free DiskSpace: " + Form.ofSize(freeSpace.getFreeSpace(), 1024));
if (getHardware.getProcessMemory() < 5999) { if (getHardware.getProcessMemory() < 5999) {
core/src/main/java/com/volmit/iris/util/misc/getHardware.java
-5
View File
@@ -13,11 +13,6 @@ public class getHardware {
OperatingSystem os = systemInfo.getOperatingSystem(); OperatingSystem os = systemInfo.getOperatingSystem();
return os.toString(); return os.toString();
} }
public static int getCPUThreads(){
SystemInfo systemInfo = new SystemInfo();
CentralProcessor processor = systemInfo.getHardware().getProcessor();
return processor.getLogicalProcessorCount();
}
public static long getProcessMemory(){ public static long getProcessMemory(){
long maxMemory = Runtime.getRuntime().maxMemory() / (1024 * 1024); long maxMemory = Runtime.getRuntime().maxMemory() / (1024 * 1024);
return maxMemory; return maxMemory;