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

Memory amount should be in long not int

Browse Source
This commit is contained in:
Laurent Clouet
2019-02-20 13:46:53 +01:00
parent 6d9ca8ef2c
commit 208f49ba1d
10 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ public class Configuration {
private String proxy; private String proxy;
private int maxUploadingJob; private int maxUploadingJob;
private int nbCores; private int nbCores;
private int maxMemory; // max memory allowed for render private long maxMemory; // max memory allowed for render
private int maxRenderTime; // max render time per frame allowed private int maxRenderTime; // max render time per frame allowed
private int priority; private int priority;
private ComputeType computeMethod; private ComputeType computeMethod;
@@ -152,11 +152,11 @@ public class Configuration {
return this.nbCores; return this.nbCores;
} }
public void setMaxMemory(int max) { public void setMaxMemory(long max) {
this.maxMemory = max; this.maxMemory = max;
} }
public int getMaxMemory() { public long getMaxMemory() {
return this.maxMemory; return this.maxMemory;
} }

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

@@ -290,8 +290,8 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
HttpURLConnection connection = null; HttpURLConnection connection = null;
try { try {
OS os = OS.getOS(); OS os = OS.getOS();
int maxMemory = this.user_config.getMaxMemory(); long maxMemory = this.user_config.getMaxMemory();
int freeMemory = os.getFreeMemory(); long freeMemory = os.getFreeMemory();
if (maxMemory < 0) { if (maxMemory < 0) {
maxMemory = freeMemory; maxMemory = freeMemory;
} }

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

@@ -64,7 +64,7 @@ public class SettingsLoader {
} }
} }
public SettingsLoader(String path_, String login_, String password_, String proxy_, String hostname_, ComputeType computeMethod_, GPUDevice gpu_, int cores_, int maxRam_, int maxRenderTime_, String cacheDir_, boolean autoSignIn_, String ui_, String tileSize_, int priority_) { public SettingsLoader(String path_, String login_, String password_, String proxy_, String hostname_, ComputeType computeMethod_, GPUDevice gpu_, int cores_, long maxRam_, int maxRenderTime_, String cacheDir_, boolean autoSignIn_, String ui_, String tileSize_, int priority_) {
if (path_ == null) { if (path_ == null) {
path = getDefaultFilePath(); path = getDefaultFilePath();
} }
@@ -350,7 +350,7 @@ public class SettingsLoader {
} }
if (config.getMaxMemory() == -1 && ram != null) { if (config.getMaxMemory() == -1 && ram != null) {
config.setMaxMemory(Integer.valueOf(ram)); config.setMaxMemory(Long.valueOf(ram));
} }
if (config.getMaxRenderTime() == -1 && renderTime != null) { if (config.getMaxRenderTime() == -1 && renderTime != null) {

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

@@ -111,7 +111,7 @@ public class FreeBSD extends OS {
} }
@Override @Override
public int getMemory() { public long getMemory() {
try { try {
Runtime r = Runtime.getRuntime(); Runtime r = Runtime.getRuntime();
Process p = r.exec("sysctl -n hw.usermem"); Process p = r.exec("sysctl -n hw.usermem");
@@ -124,7 +124,7 @@ public class FreeBSD extends OS {
return 0; return 0;
} }
Long mem_byte = Long.parseLong(line.trim()); Long mem_byte = Long.parseLong(line.trim());
return (int) (mem_byte / Long.valueOf(1024)); return mem_byte / Long.valueOf(1024);
} }
catch (IOException e) { catch (IOException e) {
Log.getInstance(null).debug("OS::FreeBSD::getMemory exception " + e); Log.getInstance(null).debug("OS::FreeBSD::getMemory exception " + e);
@@ -134,7 +134,7 @@ public class FreeBSD extends OS {
} }
@Override @Override
public int getFreeMemory() { public long getFreeMemory() {
return -1; return -1;
} }

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

@@ -88,7 +88,7 @@ public class Linux extends OS {
} }
@Override @Override
public int getMemory() { public long getMemory() {
try { try {
String filePath = "/proc/meminfo"; String filePath = "/proc/meminfo";
Scanner scanner = new Scanner(new File(filePath)); Scanner scanner = new Scanner(new File(filePath));
@@ -117,7 +117,7 @@ public class Linux extends OS {
} }
@Override @Override
public int getFreeMemory() { public long getFreeMemory() {
try { try {
String filePath = "/proc/meminfo"; String filePath = "/proc/meminfo";
Scanner scanner = new Scanner(new File(filePath)); Scanner scanner = new Scanner(new File(filePath));

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

@@ -98,7 +98,7 @@ public class Mac extends OS {
} }
@Override @Override
public int getMemory() { public long getMemory() {
String command = "sysctl hw.memsize"; String command = "sysctl hw.memsize";
Process p = null; Process p = null;
@@ -113,7 +113,7 @@ public class Mac extends OS {
if (line.startsWith(option)) { if (line.startsWith(option)) {
String memory = line.substring(option.length()).trim(); // memory in bytes String memory = line.substring(option.length()).trim(); // memory in bytes
return (int) (Long.parseLong(memory) / 1024); return Long.parseLong(memory) / 1024;
} }
} }
input.close(); input.close();
@@ -141,7 +141,7 @@ public class Mac extends OS {
} }
@Override @Override
public int getFreeMemory() { public long getFreeMemory() {
return -1; return -1;
} }

4
src/com/sheepit/client/os/OS.java
View File

@@ -31,9 +31,9 @@ public abstract class OS {
public abstract CPU getCPU(); public abstract CPU getCPU();
public abstract int getMemory(); public abstract long getMemory();
public abstract int getFreeMemory(); public abstract long getFreeMemory();
public abstract String getRenderBinaryPath(); public abstract String getRenderBinaryPath();

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

@@ -89,11 +89,11 @@ public class Windows extends OS {
} }
@Override @Override
public int getMemory() { public long getMemory() {
try { try {
MEMORYSTATUSEX _memory = new MEMORYSTATUSEX(); MEMORYSTATUSEX _memory = new MEMORYSTATUSEX();
if (Kernel32.INSTANCE.GlobalMemoryStatusEx(_memory)) { if (Kernel32.INSTANCE.GlobalMemoryStatusEx(_memory)) {
return (int) (_memory.ullTotalPhys.longValue() / 1024); // size in KB return _memory.ullTotalPhys.longValue() / 1024; // size in KB
} }
} }
catch (Exception e) { catch (Exception e) {
@@ -103,11 +103,11 @@ public class Windows extends OS {
} }
@Override @Override
public int getFreeMemory() { public long getFreeMemory() {
try { try {
MEMORYSTATUSEX _memory = new MEMORYSTATUSEX(); MEMORYSTATUSEX _memory = new MEMORYSTATUSEX();
if (Kernel32.INSTANCE.GlobalMemoryStatusEx(_memory)) { if (Kernel32.INSTANCE.GlobalMemoryStatusEx(_memory)) {
return (int) (_memory.ullAvailPhys.longValue() / 1024); // size in KB return _memory.ullAvailPhys.longValue() / 1024; // size in KB
} }
} }
catch (Exception e) { catch (Exception e) {

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

@@ -73,7 +73,7 @@ public class Worker {
private int nb_cores = -1; private int nb_cores = -1;
@Option(name = "-memory", usage = "Maximum memory allow to be used by renderer (in MB)", required = false) @Option(name = "-memory", usage = "Maximum memory allow to be used by renderer (in MB)", required = false)
private int max_ram = -1; private long max_ram = -1;
@Option(name = "-rendertime", usage = "Maximum time allow for each frame (in minute)", required = false) @Option(name = "-rendertime", usage = "Maximum time allow for each frame (in minute)", required = false)
private int max_rendertime = -1; private int max_rendertime = -1;

6
src/com/sheepit/client/standalone/swing/activity/Settings.java
View File

@@ -256,7 +256,7 @@ public class Settings implements Activity {
// max ram allowed to render // max ram allowed to render
OS os = OS.getOS(); OS os = OS.getOS();
int all_ram = os.getMemory(); int all_ram = (int) os.getMemory();
ram = new JSlider(0, all_ram); ram = new JSlider(0, all_ram);
int step = 1000000; int step = 1000000;
double display = (double)all_ram / (double)step; double display = (double)all_ram / (double)step;
@@ -272,7 +272,7 @@ public class Settings implements Activity {
ram.setLabelTable(labelTable); ram.setLabelTable(labelTable);
ram.setPaintTicks(true); ram.setPaintTicks(true);
ram.setPaintLabels(true); ram.setPaintLabels(true);
ram.setValue(config.getMaxMemory() != -1 ? config.getMaxMemory() : os.getMemory()); ram.setValue((int)(config.getMaxMemory() != -1 ? config.getMaxMemory() : os.getMemory()));
JLabel ramLabel = new JLabel("Memory:"); JLabel ramLabel = new JLabel("Memory:");
compute_devices_constraints.weightx = 1.0 / gpus.size(); compute_devices_constraints.weightx = 1.0 / gpus.size();
@@ -558,7 +558,7 @@ public class Settings implements Activity {
config.setUseNbCores(cpu_cores); config.setUseNbCores(cpu_cores);
} }
int max_ram = -1; long max_ram = -1;
if (ram != null) { if (ram != null) {
max_ram = ram.getValue(); max_ram = ram.getValue();
} }