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

lower cpu usage

Browse Source
This commit is contained in:
harlekin
2021-12-04 10:38:13 +00:00
committed by Sheepit Renderfarm
parent ea9d7ef425
commit 37244b4095
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,23 +133,22 @@ import java.util.regex.Pattern;
frameNumber, sceneMD5, rendererMD5, id, outputImagePath, path, useGPU, name, extras, updateRenderingStatusMethod, render); frameNumber, sceneMD5, rendererMD5, id, outputImagePath, path, useGPU, name, extras, updateRenderingStatusMethod, render);
} }
private OSProcess getRenderOSProcess() { private OSProcess getAsOSProcess(Process proc) {
Process proc = getProcessRender().getProcess();
return proc == null ? null : OS.operatingSystem.getProcess((int) proc.pid()); // Check for null otherwise proc.pid() will throw NullPointerEx return proc == null ? null : OS.operatingSystem.getProcess((int) proc.pid()); // Check for null otherwise proc.pid() will throw NullPointerEx
} }
public long getUsedMemory() { public long getUsedMemory() {
OSProcess osp = getRenderOSProcess(); OSProcess osp = getAsOSProcess(getProcessRender().getProcess());
return osp != null ? osp.getResidentSetSize() / 1024 : 0; return osp != null ? osp.getResidentSetSize() / 1024 : 0;
} }
public long getTotalUsedMemory() { public long getTotalUsedMemory() {
OSProcess osp = getRenderOSProcess(); OSProcess osp = getAsOSProcess(getProcessRender().getProcess());
return osp != null ? osp.getVirtualSize() / 1024 : 0; return osp != null ? osp.getVirtualSize() / 1024 : 0;
} }
private int getThreadCount() { private int getThreadCount() {
OSProcess osp = getRenderOSProcess(); OSProcess osp = getAsOSProcess(getProcessRender().getProcess());
return osp != null ? osp.getThreadCount() : 0; return osp != null ? osp.getThreadCount() : 0;
} }
@@ -358,7 +357,6 @@ import java.util.regex.Pattern;
} }
progress = computeRenderingProgress(line, tilePattern, progress); progress = computeRenderingProgress(line, tilePattern, progress);
updateRenderingMemoryPeak();
if (configuration.getMaxAllowedMemory() != -1 && getUsedMemory() > configuration.getMaxAllowedMemory()) { if (configuration.getMaxAllowedMemory() != -1 && getUsedMemory() > configuration.getMaxAllowedMemory()) {
log.debug("Blocking render because process ram used (" + getUsedMemory() + "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)");
@@ -603,7 +601,8 @@ import java.util.regex.Pattern;
} }
private void updateRenderingMemoryPeak() { private void updateRenderingMemoryPeak() {
if (getProcessRender().getProcess() != null && getRenderOSProcess() != null){ Process proc = getProcessRender().getProcess();
if (proc != null && getAsOSProcess(proc) != null){
long mem = getUsedMemory(); long mem = getUsedMemory();
getProcessRender().setMemoryUsed(mem); getProcessRender().setMemoryUsed(mem);
if (getProcessRender().getPeakMemoryUsed() < mem) { if (getProcessRender().getPeakMemoryUsed() < mem) {