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

On the job request, send the number of available cpu for rendering

Browse Source
This commit is contained in:
Laurent Clouet
2015-06-09 20:16:12 +01:00
parent fbf5b430b5
commit 553ffa1a5b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
protocol.txt
View File

@@ -76,6 +76,7 @@ On error: an 404 http code
Url: use the request type "request-job" from the configuration answer. Url: use the request type "request-job" from the configuration answer.
Parameter as GET or POST: Parameter as GET or POST:
* computemethod: What are my computer capability, 0 for using gpu and cpu (the computer is capable of using both but it will not use it at the same time), 1 for cpu only, 2 for gpu only. * computemethod: What are my computer capability, 0 for using gpu and cpu (the computer is capable of using both but it will not use it at the same time), 1 for cpu only, 2 for gpu only.
* cpu_cores: Number of cores currently available for rendering (optional).
Answer in case of error: Answer in case of error:
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>

3
src/com/sheepit/client/Server.java
View File

@@ -275,7 +275,8 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
HttpURLConnection connection = null; HttpURLConnection connection = null;
try { try {
String url = String.format("%s?computemethod=%s", this.getPage("request-job"), this.user_config.computeMethodToInt()); OS os = OS.getOS();
String url = String.format("%s?computemethod=%s&cpu_cores=%s", this.getPage("request-job"), this.user_config.computeMethodToInt(), ((this.user_config.getNbCores() == -1) ? os.getCPU().cores() : this.user_config.getNbCores()));
if (this.user_config.getComputeMethod() != ComputeType.CPU && this.user_config.getGPUDevice() != null) { if (this.user_config.getComputeMethod() != ComputeType.CPU && this.user_config.getGPUDevice() != null) {
String gpu_model = ""; String gpu_model = "";
try { try {