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

Merge branch 'estimates' into 'master'

Browse Source 
Compute our own estimates

See merge request sheepitrenderfarm/client!75
This commit is contained in:
Sheepit Renderfarm
2022-02-14 11:30:09 +00:00
parent e8249d22da a7e74d4554
commit 5aa4f3c407
1 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,6 @@ import java.util.regex.Pattern;
@Data public class Job { @Data public class Job {
public static final String UPDATE_METHOD_BY_REMAINING_TIME = "remainingtime"; public static final String UPDATE_METHOD_BY_REMAINING_TIME = "remainingtime";
public static final String UPDATE_METHOD_BLENDER_INTERNAL_BY_PART = "blenderinternal";
public static final String UPDATE_METHOD_BY_TILE = "by_tile"; public static final String UPDATE_METHOD_BY_TILE = "by_tile";
public static final int SHOW_BASE_ICON = -1; public static final int SHOW_BASE_ICON = -1;
@@ -316,7 +315,7 @@ import java.util.regex.Pattern;
try { try {
int progress = -1; int progress = -1;
Pattern tilePattern = Pattern.compile(" (Rendered|Path Tracing Tile|Rendering) (\\d+)\\s?\\/\\s?(\\d+)( Tiles| samples|,)"); Pattern progressPattern = Pattern.compile(" (Rendered|Path Tracing Tile|Rendering|Sample) (\\d+)\\s?\\/\\s?(\\d+)( Tiles| samples|,)*");
// Initialise the progress bar in the icon and the UI (0% completed at this time) // Initialise the progress bar in the icon and the UI (0% completed at this time)
gui.updateTrayIcon(0); gui.updateTrayIcon(0);
@@ -336,7 +335,7 @@ import java.util.regex.Pattern;
} }
} }
progress = computeRenderingProgress(line, tilePattern, progress); progress = computeRenderingProgress(line, progressPattern, progress);
if (configuration.getMaxAllowedMemory() != -1 && getProcessRender().getMemoryUsed().get() > configuration.getMaxAllowedMemory()) { 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 log.debug("Blocking render because process ram used (" + getProcessRender().getMemoryUsed().get() + "k) is over user setting (" + configuration
.getMaxAllowedMemory() + "k)"); .getMaxAllowedMemory() + "k)");
@@ -353,7 +352,7 @@ import java.util.regex.Pattern;
return Error.Type.RENDERER_OUT_OF_MEMORY; return Error.Type.RENDERER_OUT_OF_MEMORY;
} }
updateRenderingStatus(line); updateRenderingStatus(line, progress);
Type error = detectError(line); Type error = detectError(line);
if (error != Error.Type.OK) { if (error != Error.Type.OK) {
if (script_file != null) { if (script_file != null) {
@@ -498,33 +497,8 @@ import java.util.regex.Pattern;
return newProgress; return newProgress;
} }
private void updateRenderingStatus(String line) { private void updateRenderingStatus(String line, int progress) {
if (getUpdateRenderingStatusMethod() != null && getUpdateRenderingStatusMethod().equals(Job.UPDATE_METHOD_BLENDER_INTERNAL_BY_PART)) { if (getUpdateRenderingStatusMethod() == null || getUpdateRenderingStatusMethod().equals(Job.UPDATE_METHOD_BY_REMAINING_TIME)) {
String search = " Part ";
int index = line.lastIndexOf(search);
if (index != -1) {
String buf = line.substring(index + search.length());
String[] parts = buf.split("-");
if (parts.length == 2) {
try {
int current = Integer.parseInt(parts[0]);
int total = Integer.parseInt(parts[1]);
if (total != 0) {
long end_render = (new Date().getTime() - this.render.getStartTime()) * total / current;
Date date = new Date(end_render);
gui.setRemainingTime(String.format("%s %% (%s)", (int) (100.0 - 100.0 * current / total), Utils.humanDuration(date)));
getProcessRender().setRemainingDuration((int) (date.getTime() / 1000));
return;
}
}
catch (NumberFormatException e) {
System.out.println("Exception 92: " + e);
}
}
}
gui.status("Rendering");
}
else if (getUpdateRenderingStatusMethod() == null || getUpdateRenderingStatusMethod().equals(Job.UPDATE_METHOD_BY_REMAINING_TIME)) {
String search_remaining = "remaining:"; String search_remaining = "remaining:";
int index = line.toLowerCase().indexOf(search_remaining); int index = line.toLowerCase().indexOf(search_remaining);
if (index != -1) { if (index != -1) {
@@ -555,6 +529,20 @@ import java.util.regex.Pattern;
} }
} }
} }
else { //extrapolate remaining time from time rendered & progress
if (line.contains("Time") == true) {
long timeRendered = new Date().getTime() - getProcessRender().getStartTime();
if (progress > 0 && timeRendered > 0) {
long linearTimeEstimation = (long) ((100.0 / progress) * timeRendered);
long timeRemaining = linearTimeEstimation - timeRendered;
Date date = new Date(timeRemaining);
gui.setRemainingTime(Utils.humanDuration(date));
getProcessRender().setRemainingDuration((int) (date.getTime() / 1000));
}
}
}
} }
else if (getUpdateRenderingStatusMethod().equals(Job.UPDATE_METHOD_BY_TILE)) { else if (getUpdateRenderingStatusMethod().equals(Job.UPDATE_METHOD_BY_TILE)) {
String search = " Tile "; String search = " Tile ";