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

Merge branch 'feat/preptime' into 'master'

Browse Source 
Feat/preptime

See merge request sheepitrenderfarm/client!292
This commit is contained in:
Laurent Clouet
2024-03-14 18:08:39 +00:00
parent b87e417ccd 185170fafe
commit c615c9b36d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
protocol.txt
View File

@@ -169,6 +169,7 @@ Parameter as GET or POST:
* job: Job ID * job: Job ID
* frame: Job's frame number * frame: Job's frame number
* rendertime: Job's render time * rendertime: Job's render time
* preptime: Job's preparation time
* file: Frame to validate as form-data post * file: Frame to validate as form-data post
* memoryused (optional): Max memory used for the render * memoryused (optional): Max memory used for the render
* cores (optional): Number of cores used from the render * cores (optional): Number of cores used from the render

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

@@ -936,7 +936,7 @@ import okhttp3.HttpUrl;
} }
protected Error.Type confirmJob(Job ajob, int checkpoint) { protected Error.Type confirmJob(Job ajob, int checkpoint) {
String url_real = String.format(LOCALE, "%s&rendertime=%d&memoryused=%s", ajob.getValidationUrl(), ajob.getProcessRender().getRenderDuration(), String url_real = String.format(LOCALE, "%s&rendertime=%d&preptime=%d&memoryused=%s", ajob.getValidationUrl(), ajob.getProcessRender().getRenderDuration(), ajob.getProcessRender().getScenePrepDuration(),
ajob.getProcessRender().getPeakMemoryUsed()); ajob.getProcessRender().getPeakMemoryUsed());
if (ajob.getSpeedSamplesRendered() > 0.0) { if (ajob.getSpeedSamplesRendered() > 0.0) {
url_real += String.format(LOCALE, "&speedsamples=%s", ajob.getSpeedSamplesRendered()); url_real += String.format(LOCALE, "&speedsamples=%s", ajob.getSpeedSamplesRendered());