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

Allow user to set maximum memory he allows render to use

Browse Source
This commit is contained in:
Laurent Clouet
2017-03-29 22:13:04 +02:00
parent 42e952bddf
commit 905fff3313
6 changed files with 85 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/sheepit/client/SettingsLoader.java
View File

@@ -46,6 +46,7 @@ public class SettingsLoader {
private String computeMethod;
private String gpu;
private String cores;
private String ram;
private String cacheDir;
private String autoSignIn;
private String ui;
@@ -60,7 +61,7 @@ public class SettingsLoader {
path = path_;
}
public SettingsLoader(String login_, String password_, String proxy_, ComputeType computeMethod_, GPUDevice gpu_, int cores_, String cacheDir_, boolean autoSignIn_, String ui_, String tileSize_, int priority_) {
public SettingsLoader(String login_, String password_, String proxy_, ComputeType computeMethod_, GPUDevice gpu_, int cores_, int maxRam_, String cacheDir_, boolean autoSignIn_, String ui_, String tileSize_, int priority_) {
path = getDefaultFilePath();
login = login_;
password = password_;
@@ -73,7 +74,9 @@ public class SettingsLoader {
if (cores_ > 0) {
cores = String.valueOf(cores_);
}
if (maxRam_ > 0) {
ram = String.valueOf(maxRam_);
}
if (computeMethod_ != null) {
try {
computeMethod = computeMethod_.name();
@@ -118,6 +121,10 @@ public class SettingsLoader {
prop.setProperty("cpu-cores", cores);
}
if (ram != null) {
prop.setProperty("ram", ram);
}
if (login != null) {
prop.setProperty("login", login);
}
@@ -185,6 +192,7 @@ public class SettingsLoader {
this.ui = null;
this.tileSize = null;
this.priority = 19; // must be the same default as Configuration
this.ram = null;
if (new File(path).exists() == false) {
return;
@@ -212,6 +220,10 @@ public class SettingsLoader {
this.cores = prop.getProperty("cpu-cores");
}
if (prop.containsKey("ram")) {
this.ram = prop.getProperty("ram");
}
if (prop.containsKey("login")) {
this.login = prop.getProperty("login");
}
@@ -298,6 +310,11 @@ public class SettingsLoader {
if (config.getNbCores() == -1 && cores != null) {
config.setUseNbCores(Integer.valueOf(cores));
}
if (config.getMaxMemory() == -1 && ram != null) {
config.setMaxMemory(Integer.valueOf(ram));
}
if (config.getUserSpecifiedACacheDir() == false && cacheDir != null && new File(cacheDir).exists()) {
config.setCacheDir(new File(cacheDir));
}