Merge pull request #259 from dicej/totalMemory

move Runtime.freeMemory and totalMemory to builtin.cpp

src/builtin.cpp

@@ -302,6 +302,20 @@ Avian_java_lang_Runtime_exit
   t->m->system->exit(arguments[1]);
 }
 
+extern "C" AVIAN_EXPORT int64_t JNICALL
+Avian_java_lang_Runtime_freeMemory
+(Thread* t, object, uintptr_t*)
+{
+  return t->m->heap->remaining();
+}
+
+extern "C" AVIAN_EXPORT int64_t JNICALL
+Avian_java_lang_Runtime_totalMemory
+(Thread* t, object, uintptr_t*)
+{
+  return t->m->heap->limit();
+}
+
 extern "C" AVIAN_EXPORT int64_t JNICALL
 Avian_avian_avianvmresource_Handler_00024ResourceInputStream_getContentLength
 (Thread* t, object, uintptr_t* arguments)

src/classpath-avian.cpp

@@ -571,20 +571,6 @@ Avian_java_lang_Runtime_gc
   collect(t, Heap::MajorCollection);
 }
 
-extern "C" AVIAN_EXPORT int64_t JNICALL
-Avian_java_lang_Runtime_freeMemory
-(Thread* t, object, uintptr_t*)
-{
-  return t->m->heap->remaining();
-}
-
-extern "C" AVIAN_EXPORT int64_t JNICALL
-Avian_java_lang_Runtime_totalMemory
-(Thread* t, object, uintptr_t*)
-{
-  return t->m->heap->limit();
-}
-
 extern "C" AVIAN_EXPORT void JNICALL
 Avian_java_lang_Runtime_addShutdownHook
 (Thread* t, object, uintptr_t* arguments)

test/Misc.java

@@ -298,8 +298,14 @@ public class Misc {
       throw new RuntimeException(e);
     }
 
-    expect(new URL("http://oss.readytalk.com")
-           .getHost().equals("oss.readytalk.com"));
+    // as of this writing, we don't support URLs on Android, since it
+    // pulls in a third-party library we don't include:
+    if (! "http://www.android.com/".equals
+        (System.getProperty("java.vendor.url")))
+    {
+      expect(new URL("http://oss.readytalk.com")
+             .getHost().equals("oss.readytalk.com"));
+    }
 
     expect(java.util.Arrays.equals
 	   (new byte[] { 0, 0, 0, 0 },
@@ -336,6 +342,9 @@ public class Misc {
 
     expect(System.getProperty("buzzy.buzzy.bim.bam").equals
            ("yippy yappy yin yang"));
+
+    // just test that it's there; don't care what it returns:
+    Runtime.getRuntime().totalMemory();
   }
 
   protected class Protected { }