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

Merge branch 'ref/lombok' into 'master'

Browse Source 
Ref: use more lombok

See merge request sheepitrenderfarm/client!350
This commit is contained in:
Sheepit Renderfarm
2024-12-14 14:10:52 +00:00
parent 51885bd4e2 f3f6b2431e
commit ea8173759b
6 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/sheepit/client/Client.java
View File

@@ -441,9 +441,9 @@ import okhttp3.HttpUrl;
if (this.renderingJob != null) { if (this.renderingJob != null) {
this.gui.status("Stopping"); this.gui.status("Stopping");
if (this.renderingJob.getProcessRender().getProcess() != null) { if (this.renderingJob.getRenderProcess().getProcess() != null) {
this.renderingJob.getRenderState().setAskForRendererKill(true); this.renderingJob.getRenderState().setAskForRendererKill(true);
this.renderingJob.getProcessRender().kill(); this.renderingJob.getRenderProcess().kill();
} }
} }
@@ -647,8 +647,8 @@ import okhttp3.HttpUrl;
if (jobToReset != null) { if (jobToReset != null) {
remoteURL.addQueryParameter("frame", jobToReset.getRenderSettings().getFrameNumber()); remoteURL.addQueryParameter("frame", jobToReset.getRenderSettings().getFrameNumber());
remoteURL.addQueryParameter("job", jobToReset.getId()); remoteURL.addQueryParameter("job", jobToReset.getId());
remoteURL.addQueryParameter("render_time", Integer.toString(jobToReset.getProcessRender().getRenderDuration())); remoteURL.addQueryParameter("render_time", Integer.toString(jobToReset.getRenderProcess().getRenderDuration()));
remoteURL.addQueryParameter("memoryused", Long.toString(jobToReset.getProcessRender().getPeakMemoryUsed())); remoteURL.addQueryParameter("memoryused", Long.toString(jobToReset.getRenderProcess().getPeakMemoryUsed()));
} }
this.serverRequest.HTTPSendFile(remoteURL.build().toString(), tempFile.getAbsolutePath(), step, this.gui); this.serverRequest.HTTPSendFile(remoteURL.build().toString(), tempFile.getAbsolutePath(), step, this.gui);
tempFile.delete(); tempFile.delete();
@@ -939,8 +939,8 @@ import okhttp3.HttpUrl;
@SuppressWarnings("unused") // Suppress false positive about this.isValidatingJob - PMD rule cannot detect time-sensitive reads @SuppressWarnings("unused") // Suppress false positive about this.isValidatingJob - PMD rule cannot detect time-sensitive reads
protected Error.Type confirmJob(Job ajob, int checkpoint) { protected Error.Type confirmJob(Job ajob, int checkpoint) {
String urlReal = String.format(LOCALE, "%s&rendertime=%d&preptime=%d&memoryused=%s", ajob.getValidationUrl(), ajob.getProcessRender().getRenderDuration(), ajob.getProcessRender().getScenePrepDuration(), String urlReal = String.format(LOCALE, "%s&rendertime=%d&preptime=%d&memoryused=%s", ajob.getValidationUrl(), ajob.getRenderProcess().getRenderDuration(), ajob.getRenderProcess().getScenePrepDuration(),
ajob.getProcessRender().getPeakMemoryUsed()); ajob.getRenderProcess().getPeakMemoryUsed());
if (ajob.getRenderOutput().getSpeedSamplesRendered() > 0.0) { if (ajob.getRenderOutput().getSpeedSamplesRendered() > 0.0) {
urlReal += String.format(LOCALE, "&speedsamples=%s", ajob.getRenderOutput().getSpeedSamplesRendered()); urlReal += String.format(LOCALE, "&speedsamples=%s", ajob.getRenderOutput().getSpeedSamplesRendered());
} }

5
src/main/java/com/sheepit/client/config/SettingsLoader.java
View File

@@ -115,7 +115,6 @@ public class SettingsLoader {
public static final String ARG_DISABLE_LARGE_DOWNLOADS = "--disable-large-downloads"; public static final String ARG_DISABLE_LARGE_DOWNLOADS = "--disable-large-downloads";
public static final String ARG_INCOMPATIBLE_PROCESS = "-incompatible-process"; public static final String ARG_INCOMPATIBLE_PROCESS = "-incompatible-process";
private String path; private String path;
private Option<String> login; private Option<String> login;
@@ -216,10 +215,6 @@ public class SettingsLoader {
return option; return option;
} }
public String getFilePath() {
return path;
}
/** /**
* Takes the list of launch parameters and marks every config setting corresponding to one of the set values as launch command, ensuring that they wont overwrite * Takes the list of launch parameters and marks every config setting corresponding to one of the set values as launch command, ensuring that they wont overwrite
* the one in the config file * the one in the config file

6
src/main/java/com/sheepit/client/network/ServerRequest.java
View File

@@ -147,7 +147,7 @@ public class ServerRequest extends Thread {
urlBuilder.addQueryParameter("frame", job.getRenderSettings().getFrameNumber()).addQueryParameter("job", job.getId()); urlBuilder.addQueryParameter("frame", job.getRenderSettings().getFrameNumber()).addQueryParameter("job", job.getId());
RenderProcess process = job.getProcessRender(); RenderProcess process = job.getRenderProcess();
if (process != null) { if (process != null) {
urlBuilder.addQueryParameter("rendertime", String.valueOf(process.getDuration())) urlBuilder.addQueryParameter("rendertime", String.valueOf(process.getDuration()))
.addQueryParameter("remainingtime", String.valueOf(process.getRemainingDuration())); .addQueryParameter("remainingtime", String.valueOf(process.getRemainingDuration()));
@@ -168,9 +168,9 @@ public class ServerRequest extends Thread {
if (this.client != null && this.client.getRenderingJob() != null) { if (this.client != null && this.client.getRenderingJob() != null) {
this.client.getRenderingJob().getRenderState().setServerBlock(true); this.client.getRenderingJob().getRenderState().setServerBlock(true);
if (this.client.getRenderingJob().getProcessRender().getProcess() != null) { if (this.client.getRenderingJob().getRenderProcess().getProcess() != null) {
this.client.getRenderingJob().getRenderState().setAskForRendererKill(true); this.client.getRenderingJob().getRenderState().setAskForRendererKill(true);
this.client.getRenderingJob().getProcessRender().kill(); this.client.getRenderingJob().getRenderProcess().kill();
} }
} }
} }

2
src/main/java/com/sheepit/client/rendering/IncompatibleProcessChecker.java
View File

@@ -45,7 +45,7 @@ public class IncompatibleProcessChecker extends TimerTask {
search = search.toLowerCase(); search = search.toLowerCase();
if (isSearchProcessRunning(search)) { if (isSearchProcessRunning(search)) {
if (this.client.getRenderingJob() != null && this.client.getRenderingJob().getProcessRender().getProcess() != null) { if (this.client.getRenderingJob() != null && this.client.getRenderingJob().getRenderProcess().getProcess() != null) {
this.client.getRenderingJob().incompatibleProcessBlock(); this.client.getRenderingJob().incompatibleProcessBlock();
} }
this.client.suspend(); this.client.suspend();

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

10
src/main/java/com/sheepit/client/ui/swing/activity/Working.java
View File

@@ -380,9 +380,9 @@ public class Working implements Activity {
.setText(Utils.humanDuration(new Date((new Date().getTime() - this.parent.getClient().getStartTime())))); .setText(Utils.humanDuration(new Date((new Date().getTime() - this.parent.getClient().getStartTime()))));
} }
Job job = this.parent.getClient().getRenderingJob(); Job job = this.parent.getClient().getRenderingJob();
if (job != null && job.getProcessRender() != null && job.getProcessRender().getStartTime() > 0) { if (job != null && job.getRenderProcess() != null && job.getRenderProcess().getStartTime() > 0) {
current_project_duration_value current_project_duration_value
.setText("<html>" + Utils.humanDuration(new Date((new Date().getTime() - job.getProcessRender().getStartTime()))) + "</html>"); .setText("<html>" + Utils.humanDuration(new Date((new Date().getTime() - job.getRenderProcess().getStartTime()))) + "</html>");
} }
else { else {
current_project_duration_value.setText(""); current_project_duration_value.setText("");
@@ -439,10 +439,10 @@ public class Working implements Activity {
if (icon != null) { if (icon != null) {
lastRender.setIcon(icon); lastRender.setIcon(icon);
// don't use lastJob.getProcessRender().getDuration() due to timezone // don't use lastJob.getRenderProcess().getDuration() due to timezone
if (lastJob.getProcessRender().getDuration() > 1) { if (lastJob.getRenderProcess().getDuration() > 1) {
lastRenderTime.setText( lastRenderTime.setText(
"Render time : " + Utils.humanDuration(new Date(lastJob.getProcessRender().getRenderDuration() * 1000L)) "Render time : " + Utils.humanDuration(new Date(lastJob.getRenderProcess().getRenderDuration() * 1000L))
); );
} }
} }