Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move kilobyte conversion to getter methods

Browse Source 
similar to what is already being done in OS
This commit is contained in:
DaCoolX
2021-11-16 16:02:45 +01:00
parent 1969f57da3
commit 0d6ca83d26
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/sheepit/client/Job.java
View File

@@ -139,12 +139,12 @@ import java.util.regex.Pattern;
public long getUsedMemory() { public long getUsedMemory() {
OSProcess osp = getRenderOSProcess(); OSProcess osp = getRenderOSProcess();
return osp != null ? osp.getResidentSetSize() : 0; return osp != null ? osp.getResidentSetSize() / 1024 : 0;
} }
public long getTotalUsedMemory() { public long getTotalUsedMemory() {
OSProcess osp = getRenderOSProcess(); OSProcess osp = getRenderOSProcess();
return osp != null ? osp.getVirtualSize() : 0; return osp != null ? osp.getVirtualSize() / 1024 : 0;
} }
private int getThreadCount() { private int getThreadCount() {
@@ -365,8 +365,8 @@ import java.util.regex.Pattern;
progress = computeRenderingProgress(line, tilePattern, progress); progress = computeRenderingProgress(line, tilePattern, progress);
updateRenderingMemoryPeak(); updateRenderingMemoryPeak();
if (configuration.getMaxAllowedMemory() != -1 && (getUsedMemory() / 1024L) > configuration.getMaxAllowedMemory()) { if (configuration.getMaxAllowedMemory() != -1 && getUsedMemory() > configuration.getMaxAllowedMemory()) {
log.debug("Blocking render because process ram used (" + (getUsedMemory() / 1024L) + "k) is over user setting (" + configuration log.debug("Blocking render because process ram used (" + getUsedMemory() + "k) is over user setting (" + configuration
.getMaxAllowedMemory() + "k)"); .getMaxAllowedMemory() + "k)");
OS.getOS().kill(process.getProcess()); OS.getOS().kill(process.getProcess());
process.finish(); process.finish();
@@ -609,14 +609,14 @@ import java.util.regex.Pattern;
} }
private void updateRenderingMemoryPeak() { private void updateRenderingMemoryPeak() {
long mem = getUsedMemory() / 1024L; // convert into kB long mem = getUsedMemory();
getProcessRender().setMemoryUsed(mem); getProcessRender().setMemoryUsed(mem);
if (getProcessRender().getPeakMemoryUsed() < mem) { if (getProcessRender().getPeakMemoryUsed() < mem) {
getProcessRender().setPeakMemoryUsed(mem); getProcessRender().setPeakMemoryUsed(mem);
} }
double memoryConsumed = getUsedMemory() / 1024.0 / 1024.0; double memoryConsumed = getUsedMemory() / 1024.0;
double peakMemoryConsumed = getProcessRender().getPeakMemoryUsed() / 1024.0; double peakMemoryConsumed = getProcessRender().getPeakMemoryUsed() / 1024.0;
double totalUsedMemory = getTotalUsedMemory() / 1024.0 / 1024.0; double totalUsedMemory = getTotalUsedMemory() / 1024.0;
double systemMemoryAvailable = OS.getOS().getFreeMemory() / 1024.0; double systemMemoryAvailable = OS.getOS().getFreeMemory() / 1024.0;
int threadCount = getThreadCount(); int threadCount = getThreadCount();
log.debug(String.format("RAM Consumed: %(,.2fMB | Peak RAM Consumed: %(,.2fMB | Virtual Mem Consumed: %(,.2fMB | System Available Memory: %(,.2fMB | Thread Count: %d", log.debug(String.format("RAM Consumed: %(,.2fMB | Peak RAM Consumed: %(,.2fMB | Virtual Mem Consumed: %(,.2fMB | System Available Memory: %(,.2fMB | Thread Count: %d",