intro veryhighmem setting with no custom -Xms and -Xmx for boxes with >= 3 GB

Signed-off-by: Markus Storm <markus.storm@gmx.net>

Author: mstormi

functions/helpers.bash

@@ -439,7 +439,7 @@ has_lowmem() {
 ## Returns 0 / true if device has more than 1500MB of total memory
 ## Returns 1 / false if device has less than 1500MB of total memory
 ##
-##    has_hasmem()
+##    has_highmem()
 ##
 has_highmem() {
   local totalMemory
@@ -450,6 +450,20 @@ has_highmem() {
   if [[ $totalMemory -gt 1500000 ]]; then return 0; else return 1; fi
 }
 
+## Returns 0 / true if device has more than 3000MB of total memory
+## Returns 1 / false if device has less than 3000MB of total memory
+##
+##    has_veryhighmem()
+##
+has_veryhighmem() {
+  local totalMemory
+
+  totalMemory="$(awk '/MemTotal/ {print $2}' /proc/meminfo)"
+
+  if [[ -z $totalMemory ]]; then return 1; fi # assume that device does not have very high memory
+  if [[ $totalMemory -gt 3000000 ]]; then return 0; else return 1; fi
+}
+
 ## Attempt to update apt package lists 10 times
 ## unless 'apt-get update' evaulates to 0.
 ## Sleeps for 1 second between each attempt.

functions/openhab.bash

@@ -231,7 +231,11 @@ openhab_misc() {
   if has_lowmem; then
     if cond_redirect sed -i -e 's|^EXTRA_JAVA_OPTS=.*$|EXTRA_JAVA_OPTS="-Xms16m -Xmx256m -Xss1024k -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -XX:+ExitOnOutOfMemoryError -Dxtext.qn.interning=true"|g' /etc/default/openhab; then echo "OK"; else echo "FAILED"; return 1; fi
   elif has_highmem; then
-    if cond_redirect sed -i -e 's|^EXTRA_JAVA_OPTS=.*$|EXTRA_JAVA_OPTS="-Xms192m -Xmx768m -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -XX:+ExitOnOutOfMemoryError -Dxtext.qn.interning=true"|g' /etc/default/openhab; then echo "OK"; else echo "FAILED"; return 1; fi
+    if has_veryhighmem; then
+      if cond_redirect sed -i -e 's|^EXTRA_JAVA_OPTS=.*$|EXTRA_JAVA_OPTS="-XX:-TieredCompilation -XX:TieredStopAtLevel=1 -XX:+ExitOnOutOfMemoryError -Dxtext.qn.interning=true"|g' /etc/default/openhab; then echo "OK"; else echo "FAILED"; return 1; fi
+    else
+      if cond_redirect sed -i -e 's|^EXTRA_JAVA_OPTS=.*$|EXTRA_JAVA_OPTS="-Xms192m -Xmx768m -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -XX:+ExitOnOutOfMemoryError -Dxtext.qn.interning=true"|g' /etc/default/openhab; then echo "OK"; else echo "FAILED"; return 1; fi
+    fi
   else
     if cond_redirect sed -i -e 's|^EXTRA_JAVA_OPTS=.*$|EXTRA_JAVA_OPTS="-Xms192m -Xmx384m -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -XX:+ExitOnOutOfMemoryError -Dxtext.qn.interning=true"|g' /etc/default/openhab; then echo "OK"; else echo "FAILED"; return 1; fi
   fi