Max memory settings can be set using human number with unit

This commit is contained in:
Laurent Clouet
2019-02-20 13:53:18 +01:00
parent 208f49ba1d
commit 388b1158bd
4 changed files with 34 additions and 19 deletions

View File

@@ -565,7 +565,7 @@ public class Job {
int end = element.indexOf(')');
if (end > 0) {
try {
long mem = Utils.parseNumber(element.substring(1, end).trim());
long mem = Utils.parseNumber(element.substring(1, end).trim()) / 1000; // internal use of ram is in kB
if (mem > getProcessRender().getMemoryUsed()) {
getProcessRender().setMemoryUsed(mem);
}
@@ -580,7 +580,7 @@ public class Job {
int end = element.indexOf('|');
if (end > 0) {
try {
long mem = Utils.parseNumber(element.substring(1, end).trim());
long mem = Utils.parseNumber(element.substring(1, end).trim()) / 1000; // internal use of ram is in kB
if (mem > getProcessRender().getMemoryUsed()) {
getProcessRender().setMemoryUsed(mem);
}