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

Ref: use more lombok

Browse Source
This commit is contained in:
Sheepit Renderfarm
2024-12-14 14:10:52 +00:00
parent 51885bd4e2
commit f3f6b2431e
6 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/sheepit/client/rendering/Job.java
View File

@@ -79,7 +79,7 @@ import static com.sheepit.client.rendering.RenderSettings.UPDATE_METHOD_BY_TILE;
private boolean synchronousUpload;
private RenderSettings renderSettings;
private RenderProcess renderProcess;
@Getter private RenderProcess renderProcess;
private RenderOutput renderOutput;
private RenderState renderState;
@@ -112,7 +112,7 @@ import static com.sheepit.client.rendering.RenderSettings.UPDATE_METHOD_BY_TILE;
public void block() {
renderState.setBlock();
RenderProcess process = getProcessRender();
RenderProcess process = getRenderProcess();
if (process != null) {
process.kill();
}
@@ -120,16 +120,12 @@ import static com.sheepit.client.rendering.RenderSettings.UPDATE_METHOD_BY_TILE;
public void incompatibleProcessBlock() {
renderState.setBlockIncompatibleProcess();
RenderProcess process = getProcessRender();
RenderProcess process = getRenderProcess();
if (process != null) {
process.kill();
}
}
public RenderProcess getProcessRender() {
return renderProcess;
}
@Override
public String toString() {
return String
@@ -160,7 +156,7 @@ import static com.sheepit.client.rendering.RenderSettings.UPDATE_METHOD_BY_TILE;
public Error.Type render(Observer renderStarted) {
gui.status("Rendering");
RenderProcess process = getProcessRender();
RenderProcess process = getRenderProcess();
Timer timerOfMaxRenderTime = null;
String core_script;
// When sending Ctrl+C to the terminal it also get's sent to all subprocesses e.g. also the render process.
@@ -339,9 +335,9 @@ import static com.sheepit.client.rendering.RenderSettings.UPDATE_METHOD_BY_TILE;
OS os = OS.getOS();
process.setCoresUsed(configuration.getNbCores());
process.start();
getProcessRender().setProcess(os.exec(command, new_env));
getProcessRender().setOsProcess(OS.operatingSystem.getProcess((int) getProcessRender().getProcess().pid()));
BufferedReader input = new BufferedReader(new InputStreamReader(getProcessRender().getProcess().getInputStream()));
getRenderProcess().setProcess(os.exec(command, new_env));
getRenderProcess().setOsProcess(OS.operatingSystem.getProcess((int) getRenderProcess().getProcess().pid()));
BufferedReader input = new BufferedReader(new InputStreamReader(getRenderProcess().getProcess().getInputStream()));
memoryCheck.scheduleAtFixedRate(new TimerTask() {
@Override public void run() {
updateProcess();
@@ -354,7 +350,7 @@ import static com.sheepit.client.rendering.RenderSettings.UPDATE_METHOD_BY_TILE;
timerOfMaxRenderTime = new Timer();
timerOfMaxRenderTime.schedule(new TimerTask() {
@Override public void run() {
RenderProcess process = getProcessRender();
RenderProcess process = getRenderProcess();
if (process != null) {
long duration = (new Date().getTime() - process.getStartTime()) / 1000; // in seconds
if (configuration.getMaxRenderTime() > 0 && duration > configuration.getMaxRenderTime()) {
@@ -437,8 +433,8 @@ import static com.sheepit.client.rendering.RenderSettings.UPDATE_METHOD_BY_TILE;
}
}
if (configuration.getMaxAllowedMemory() != -1 && getProcessRender().getMemoryUsed().get() > configuration.getMaxAllowedMemory()) {
log.debug("Blocking render because process ram used (" + getProcessRender().getMemoryUsed().get() + "k) is over user setting (" + configuration
if (configuration.getMaxAllowedMemory() != -1 && getRenderProcess().getMemoryUsed().get() > configuration.getMaxAllowedMemory()) {
log.debug("Blocking render because process ram used (" + getRenderProcess().getMemoryUsed().get() + "k) is over user setting (" + configuration
.getMaxAllowedMemory() + "k)");
process.finish();
if (process.getRenderDuration() == -1) {
@@ -491,7 +487,7 @@ import static com.sheepit.client.rendering.RenderSettings.UPDATE_METHOD_BY_TILE;
return error;
}
if (!event.isStarted() && (getProcessRender().getMemoryUsed().get() > 0 && scenePrepStarted || process.getRemainingDuration() > 0)) {
if (!event.isStarted() && (getRenderProcess().getMemoryUsed().get() > 0 && scenePrepStarted || process.getRemainingDuration() > 0)) {
event.doNotifyIsStarted();
}
}
@@ -725,7 +721,7 @@ import static com.sheepit.client.rendering.RenderSettings.UPDATE_METHOD_BY_TILE;
date_parse.setTimeZone(TimeZone.getTimeZone("GMT"));
Date date = date_parse.parse(remaining_time);
gui.setRemainingTime(Utils.humanDuration(date));
getProcessRender().setRemainingDuration((int) (date.getTime() / 1000));
getRenderProcess().setRemainingDuration((int) (date.getTime() / 1000));
}
catch (ParseException err) {
log.error("Client::updateRenderingStatus ParseException " + err);
@@ -734,7 +730,7 @@ import static com.sheepit.client.rendering.RenderSettings.UPDATE_METHOD_BY_TILE;
}
else { //extrapolate remaining time from time rendered & progress
if (line.contains("Time") == true) {
long timeRendered = new Date().getTime() - getProcessRender().getStartTime();
long timeRendered = new Date().getTime() - getRenderProcess().getStartTime();
if (progress > 0 && timeRendered > 0) {
long linearTimeEstimation = (long) ((100.0 / progress) * timeRendered);
@@ -742,7 +738,7 @@ import static com.sheepit.client.rendering.RenderSettings.UPDATE_METHOD_BY_TILE;
Date date = new Date(timeRemaining);
gui.setRemainingTime(Utils.humanDuration(date));
getProcessRender().setRemainingDuration((int) (date.getTime() / 1000));
getRenderProcess().setRemainingDuration((int) (date.getTime() / 1000));
}
}
}
@@ -772,7 +768,7 @@ import static com.sheepit.client.rendering.RenderSettings.UPDATE_METHOD_BY_TILE;
}
private void updateProcess() {
getProcessRender().update();
getRenderProcess().update();
}
private void maybeCleanWorkingDir(Type error) {