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

add the ability to set the priority of the render process as commandline argument

Browse Source
This commit is contained in:
Rolf Aretz Lap
2017-01-05 09:58:27 +01:00
committed by Laurent Clouet
parent 2f00d7816d
commit d8aa315699
7 changed files with 105 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/sheepit/client/Configuration.java
View File

@@ -47,6 +47,7 @@ public class Configuration {
private String proxy;
private int maxUploadingJob;
private int nbCores;
private int priority;
private ComputeType computeMethod;
private GPUDevice GPUDevice;
private boolean printLog;
@@ -63,6 +64,7 @@ public class Configuration {
this.static_exeDirName = "exe";
this.maxUploadingJob = 1;
this.nbCores = -1; // ie not set
this.priority = 19;
this.computeMethod = null;
this.GPUDevice = null;
this.userSpecifiedACacheDir = false;
@@ -125,6 +127,20 @@ public class Configuration {
return this.nbCores;
}
public void setUsePriority(int priority) {
if (priority > 19)
priority = 19;
if (priority < -19)
priority = -19;
this.priority = priority;
}
public int getPriority() {
return this.priority;
}
public void setPrintLog(boolean val) {
this.printLog = val;
}

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

@@ -237,6 +237,7 @@ public class Job {
new_env.put("BLENDER_USER_CONFIG", config.workingDirectory.getAbsolutePath().replace("\\", "\\\\"));
new_env.put("CORES", Integer.toString(config.getNbCores()));
new_env.put("PRIORITY", Integer.toString(config.getPriority()));
for (String arg : command1) {
switch (arg) {

5
src/com/sheepit/client/os/FreeBSD.java
View File

@@ -161,7 +161,12 @@ public class FreeBSD extends OS {
}
if (this.hasNiceBinary.booleanValue()) {
// launch the process in lowest priority
if (env_overight != null) {
actual_command.add(0, env_overight.get("PRIORITY"));
}
else {
actual_command.add(0, "19");
}
actual_command.add(0, "-n");
actual_command.add(0, NICE_BINARY_PATH);
}

5
src/com/sheepit/client/os/Linux.java
View File

@@ -144,7 +144,12 @@ public class Linux extends OS {
}
if (this.hasNiceBinary.booleanValue()) {
// launch the process in lowest priority
if (env_overight != null) {
actual_command.add(0, env_overight.get("PRIORITY"));
}
else {
actual_command.add(0, "19");
}
actual_command.add(0, "-n");
actual_command.add(0, NICE_BINARY_PATH);
}

5
src/com/sheepit/client/os/Mac.java
View File

@@ -148,7 +148,12 @@ public class Mac extends OS {
}
if (this.hasNiceBinary.booleanValue()) {
// launch the process in lowest priority
if (env != null) {
actual_command.add(0, env.get("PRIORITY"));
}
else {
actual_command.add(0, "19");
}
actual_command.add(0, "-n");
actual_command.add(0, NICE_BINARY_PATH);
}

65
src/com/sheepit/client/os/Windows.java
View File

@@ -132,7 +132,13 @@ public class Windows extends OS {
}
Process p = builder.start();
WinProcess wproc = new WinProcess(p);
if (env != null) {
String priority = env.get("PRIORITY");
wproc.setPriority(getPriorityClass(Integer.parseInt(priority)));
}
else {
wproc.setPriority(WinProcess.PRIORITY_BELOW_NORMAL);
}
if (env != null) {
String cores = env.get("CORES");
wproc.setAffinity(Integer.parseInt(cores));
@@ -140,6 +146,65 @@ public class Windows extends OS {
return p;
}
int getPriorityClass(int priority) {
int process_class = WinProcess.PRIORITY_IDLE;
switch (priority) {
case 19:
case 18:
case 17:
case 16:
case 15:
process_class = WinProcess.PRIORITY_IDLE;
break;
case 14:
case 13:
case 12:
case 11:
case 10:
case 9:
case 8:
case 7:
case 6:
case 5:
process_class = WinProcess.PRIORITY_BELOW_NORMAL;
break;
case 4:
case 3:
case 2:
case 1:
case 0:
case -1:
case -2:
case -3:
process_class = WinProcess.PRIORITY_NORMAL;
break;
case -4:
case -5:
case -6:
case -7:
case -8:
case -9:
process_class = WinProcess.PRIORITY_ABOVE_NORMAL;
break;
case -10:
case -11:
case -12:
case -13:
case -14:
process_class = WinProcess.PRIORITY_HIGH;
break;
case -15:
case -16:
case -17:
case -18:
case -19:
process_class = WinProcess.PRIORITY_REALTIME;
break;
}
return process_class;
}
@Override
public boolean kill(Process process) {
if (process != null) {

4
src/com/sheepit/client/standalone/Worker.java
View File

@@ -91,6 +91,9 @@ public class Worker {
@Option(name = "--no-systray", usage = "Don't use systray", required = false)
private boolean no_systray = false;
@Option(name = "-priority", usage = "Set render process priority (19 lowest to -19 highest)", required = false)
private int priority = 19;
public static void main(String[] args) {
new Worker().doMain(args);
}
@@ -112,6 +115,7 @@ public class Worker {
ComputeType compute_method = ComputeType.CPU;
Configuration config = new Configuration(null, login, password);
config.setPrintLog(print_log);
config.setUsePriority(priority);
if (cache_dir != null) {
File a_dir = new File(cache_dir);