Merge pull request #553 from Kaiepi/mem

Implement freemem and totalmem ops

src/vm/js/Operations.nqp

@@ -1910,6 +1910,8 @@ class QAST::OperationsJS {
     add_simple_op('uname', $T_OBJ, [], :side_effects);
 
     add_simple_op('cpucores', $T_INT, []);
+    add_simple_op('freemem', $T_INT, []);
+    add_simple_op('totalmem', $T_INT, []);
 
     add_simple_op('unicmp_s', $T_INT, [$T_STR, $T_STR, $T_INT, $T_INT, $T_INT]);
 

src/vm/js/nqp-runtime/core.js

@@ -2091,6 +2091,14 @@ op.cpucores = function() {
   return os.cpus().length;
 };
 
+op.freemem = function() {
+  return os.freemem();
+};
+
+op.totalmem = function() {
+  return os.totalmem();
+};
+
 op.atomicinc_i = function(ctx, ref) {
   const value = ref.$$getInt();
   ref.$$assign_i(ctx, value+1);

src/vm/jvm/QAST/Compiler.nqp

@@ -2870,6 +2870,8 @@ QAST::OperationsJAST.map_classlib_core_op('semtryacquire', $TYPE_OPS, 'semtryacq
 QAST::OperationsJAST.map_classlib_core_op('semrelease', $TYPE_OPS, 'semrelease', [$RT_OBJ], $RT_OBJ, :tc);
 QAST::OperationsJAST.map_classlib_core_op('queuepoll', $TYPE_OPS, 'queuepoll', [$RT_OBJ], $RT_OBJ, :tc);
 QAST::OperationsJAST.map_classlib_core_op('cpucores', $TYPE_OPS, 'cpucores', [], $RT_INT, :tc);
+QAST::OperationsJAST.map_classlib_core_op('freemem', $TYPE_OPS, 'freemem', [], $RT_INT, :tc);
+QAST::OperationsJAST.map_classlib_core_op('totalmem', $TYPE_OPS, 'totalmem', [], $RT_INT, :tc);
 QAST::OperationsJAST.map_classlib_core_op('threadlockcount', $TYPE_OPS, 'threadlockcount', [$RT_OBJ], $RT_INT, :tc);
 
 # asynchrony related ops

src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java

@@ -13,6 +13,7 @@
 import java.lang.reflect.Method;
 import java.lang.ProcessHandle;
 import java.lang.ProcessBuilder.Redirect;
+import java.lang.Runtime;
 import java.lang.Thread;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -4289,17 +4290,17 @@ public static long eqatic(String haystack, String needle, long offset) {
     public static long ordfirst(String str) {
         if (str.isEmpty()) {
             return -1;
-	}
-	else {
+        }
+        else {
             return str.codePointAt(0);
-	}
+        }
     }
 
     public static long ordat(String str, long offset) {
         if (offset < 0 || offset >= str.length()) {
             return -1;
         }
-	else {
+        else {
             return str.codePointAt((int)offset);
         }
     }
@@ -4308,7 +4309,7 @@ public static long ordbaseat(String str, long offset) {
         if (offset < 0 || offset >= str.length()) {
             return -1;
         }
-	else {
+        else {
             int code = str.codePointAt((int)offset);
             String letter = new String(new int[]{code}, 0, 1);
             return Normalizer.normalize(letter, Normalizer.Form.NFD).codePointAt(0);
@@ -5805,6 +5806,14 @@ public static long cpucores(ThreadContext tc) {
         return Runtime.getRuntime().availableProcessors();
     }
 
+    public static long freemem(ThreadContext tc) {
+        return Runtime.getRuntime().freeMemory();
+    }
+
+    public static long totalmem(ThreadContext tc) {
+        return Runtime.getRuntime().totalMemory();
+    }
+
     public static SixModelObject lock(SixModelObject lock, ThreadContext tc) {
         if (lock instanceof ReentrantMutexInstance) {
             ((ReentrantMutexInstance)lock).lock.lock();

src/vm/moar/QAST/QASTOperationsMAST.nqp

@@ -3136,6 +3136,8 @@ QAST::MASTOperations.add_core_moarop_mapping('semtryacquire', 'semtryacquire');
 QAST::MASTOperations.add_core_moarop_mapping('semrelease', 'semrelease');
 QAST::MASTOperations.add_core_moarop_mapping('queuepoll', 'queuepoll');
 QAST::MASTOperations.add_core_moarop_mapping('cpucores', 'cpucores');
+QAST::MASTOperations.add_core_moarop_mapping('freemem', 'freemem');
+QAST::MASTOperations.add_core_moarop_mapping('totalmem', 'totalmem');
 QAST::MASTOperations.add_core_moarop_mapping('threadlockcount', 'threadlockcount');
 
 # asynchrony related ops