FreeBSD, SunOS - Corrected total memory size

NordicFlyer · Mar 23, 2014 · 60528be · 60528be
1 parent bb05ac2
commit 60528be
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/linux/products/lightzone b/linux/products/lightzone
@@ -6,7 +6,20 @@ echo Starting LightZone version 4.1.0 beta6 ...
 echo with options : ${@}
 
 arch=`getconf LONG_BIT`
-totalmem=`cat /proc/meminfo | grep MemTotal | sed -r 's/.* ([0-9]+) .*/\1/'`
+PLATFORM=`uname`
+if [ "${PLATFORM}" = "Linux" ]; then
+  totalmem=`cat /proc/meminfo | grep 'MemTotal: ' | sed -r 's/.* ([0-9]+) .*/\1/'`
+  sharedir=/opt/lightzone
+elif [ "${PLATFORM}" = "SunOS" ]; then
+  totalmem=`prtconf | grep 'Memory size:' | sed -r 's/.* ([0-9]+) .*/\1/'`
+  totalmem=`expr $totalmem \* 1024`
+  sharedir=/opt/lightzone
+elif [ "${PLATFORM}" = "FreeBSD" ]; then
+  totalmem=`dmesg | grep 'real memory' | sed -r 's/.* ([0-9]+) .*/\1/'`
+  totalmem=`expr $totalmem / 1024`
+  sharedir=/usr/local/share/java/lightzone
+fi
+
 if [ $totalmem -ge 1024000 ]; then
         maxmem=$(( $totalmem / 2 ))
         # on 32-bit architectures there is ~2GB limit for maximum Java heap size
@@ -17,4 +30,4 @@ else
         maxmem=512000
 fi
 
-(cd "/opt/lightzone" && LD_PRELOAD="$lzmalibrary" LD_LIBRARY_PATH="/opt/lightzone" exec java -Xmx${maxmem}k -Djava.library.path="/opt/lightzone" -Dfile.encoding=UTF8 -classpath "/opt/lightzone/*" com.lightcrafts.platform.linux.LinuxLauncher ${@} )
+(cd $sharedir && LD_LIBRARY_PATH=$sharedir exec java -Xmx${maxmem}k -Djava.library.path=$sharedir -Dfile.encoding=UTF8 -classpath "$sharedir/*" com.lightcrafts.platform.linux.LinuxLauncher ${@} )
diff --git a/linux/scripts/findmaxmem.sh b/linux/scripts/findmaxmem.sh
@@ -16,6 +16,7 @@ elif [ "${PLATFORM}" = "SunOS" ]; then
   totalmem=`expr $totalmem \* 1024`
 elif [ "${PLATFORM}" = "FreeBSD" ]; then
   totalmem=`dmesg | grep 'real memory' | sed -r 's/.* ([0-9]+) .*/\1/'`
+  totalmem=`expr $totalmem / 1024`
 fi
 echo $totalmem
 

diff --git a/linux/src/com/lightcrafts/platform/linux/LinuxPlatform.java b/linux/src/com/lightcrafts/platform/linux/LinuxPlatform.java
@@ -164,10 +164,12 @@ public int getPhysicalMemoryInMB() {
                 if (matcher.matches()) {
                     String text = matcher.replaceAll("$1");
                     int i = Integer.parseInt(text);
-                    if (osname.indexOf("SunOS") >= 0)
+                    if (osname.indexOf("Linux") >= 0)
+                        return i / 1024;
+                    else if (osname.indexOf("SunOS") >= 0)
                         return i;
                     else
-                        return i / 1024;
+                        return i / 1048576;
                 }
                 line = buffer.readLine();
             }