am 90134b33: am 95adf1ff: Fix native allocation tracking on Dalvik.

* commit '90134b331b06fa9b64a864b838293689ecb860d5':
  Fix native allocation tracking on Dalvik.

5 files changed, 90 insertions, 6 deletions

diff --git a/tests/098-native-allocations/expected.txt b/tests/098-native-allocations/expected.txt
new file mode 100644
index 000000000..f75da10ca
--- /dev/null
+++ b/tests/098-native-allocations/expected.txt
@@ -0,0 +1 @@
+Test complete
diff --git a/tests/098-native-allocations/info.txt b/tests/098-native-allocations/info.txt
new file mode 100644
index 000000000..2e5b88ac6
--- /dev/null
+++ b/tests/098-native-allocations/info.txt
@@ -0,0 +1,2 @@
+This is a test to verify that native allocation successfully runs
+finalizers and prevents OOM.
diff --git a/tests/098-native-allocations/src/Main.java b/tests/098-native-allocations/src/Main.java
new file mode 100644
index 000000000..87179b54e
--- /dev/null
+++ b/tests/098-native-allocations/src/Main.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.lang.reflect.*;
+
+class Main {
+    static Object nativeLock = new Object();
+    static int nativeBytes = 0;
+    static Object runtime;
+    static Method register_native_allocation;
+    static Method register_native_free;
+    static int maxMem = 64 * 1024 * 1024;
+
+    static class NativeAllocation {
+        private int bytes;
+
+        NativeAllocation(int bytes) throws Exception {
+            this.bytes = bytes;
+            register_native_allocation.invoke(runtime, bytes);
+            synchronized (nativeLock) {
+                nativeBytes += bytes;
+                if (nativeBytes > maxMem) {
+                    throw new OutOfMemoryError();
+                }
+            }
+        }
+
+        protected void finalize() throws Exception {
+            synchronized (nativeLock) {
+                nativeBytes -= bytes;
+            }
+            register_native_free.invoke(runtime, bytes);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        Class<?> vm_runtime = Class.forName("dalvik.system.VMRuntime");
+        Method get_runtime = vm_runtime.getDeclaredMethod("getRuntime");
+        runtime = get_runtime.invoke(null);
+        register_native_allocation = vm_runtime.getDeclaredMethod("registerNativeAllocation", Integer.TYPE);
+        register_native_free = vm_runtime.getDeclaredMethod("registerNativeFree", Integer.TYPE);
+        int count = 16;
+        int size = 512 * 0x400;
+        int allocation_count = 256;
+        NativeAllocation[] allocations = new NativeAllocation[count];
+        for (int i = 0; i < allocation_count; ++i) {
+            allocations[i % count] = new NativeAllocation(size);
+        }
+        System.out.println("Test complete");
+    }
+}
+
diff --git a/vm/alloc/Alloc.cpp b/vm/alloc/Alloc.cpp
index 8edbbf685..3d40d1165 100644
--- a/vm/alloc/Alloc.cpp
+++ b/vm/alloc/Alloc.cpp
@@ -315,6 +315,7 @@ void dvmRunFinalization() {
   Thread *self = dvmThreadSelf();
   assert(self != NULL);
   JValue unusedResult;
+  assert(gDvm.methJavaLangSystem_runFinalization != NULL);
   dvmCallMethod(self, gDvm.methJavaLangSystem_runFinalization, NULL, &unusedResult);
 }
 
diff --git a/vm/alloc/HeapSource.cpp b/vm/alloc/HeapSource.cpp
index 2c0a47489..82c2b9e95 100644
--- a/vm/alloc/HeapSource.cpp
+++ b/vm/alloc/HeapSource.cpp
@@ -29,6 +29,7 @@
 #include "alloc/HeapBitmap.h"
 #include "alloc/HeapBitmapInlines.h"
 
+static void dvmHeapSourceUpdateMaxNativeFootprint();
 static void snapIdealFootprint();
 static void setIdealFootprint(size_t max);
 static size_t getMaximumSize(const HeapSource *hs);
@@ -183,6 +184,7 @@ struct HeapSource {
     int32_t nativeBytesAllocated;
     size_t nativeFootprintGCWatermark;
     size_t nativeFootprintLimit;
+    bool nativeNeedToRunFinalization;
 
     /*
      * State for the GC daemon.
@@ -648,6 +650,7 @@ GcHeap* dvmHeapSourceStartup(size_t startSize, size_t maximumSize,
     hs->nativeBytesAllocated = 0;
     hs->nativeFootprintGCWatermark = startSize;
     hs->nativeFootprintLimit = startSize * 2;
+    hs->nativeNeedToRunFinalization = false;
     hs->hasGcThread = false;
     hs->heapBase = (char *)base;
     hs->heapLength = length;
@@ -1408,6 +1411,11 @@ void dvmHeapSourceGrowForUtilization()
     } else {
         heap->concurrentStartBytes = freeBytes - CONCURRENT_START;
     }
+
+    /* Mark that we need to run finalizers and update the native watermarks
+     * next time we attempt to register a native allocation.
+     */
+    gHs->nativeNeedToRunFinalization = true;
 }
 
 /*
@@ -1523,6 +1531,15 @@ static void dvmHeapSourceUpdateMaxNativeFootprint()
 
 void dvmHeapSourceRegisterNativeAllocation(int bytes)
 {
+    /* If we have just done a GC, ensure that the finalizers are done and update
+     * the native watermarks.
+     */
+    if (gHs->nativeNeedToRunFinalization) {
+        dvmRunFinalization();
+        dvmHeapSourceUpdateMaxNativeFootprint();
+        gHs->nativeNeedToRunFinalization = false;
+    }
+
     android_atomic_add(bytes, &gHs->nativeBytesAllocated);
 
     if ((size_t)gHs->nativeBytesAllocated > gHs->nativeFootprintGCWatermark) {
@@ -1532,19 +1549,17 @@ void dvmHeapSourceRegisterNativeAllocation(int bytes)
          */
         if ((size_t)gHs->nativeBytesAllocated > gHs->nativeFootprintLimit) {
             Thread* self = dvmThreadSelf();
-
             dvmRunFinalization();
-            if (!dvmCheckException(self)) {
+            if (dvmCheckException(self)) {
                 return;
             }
-
             dvmLockHeap();
             bool waited = dvmWaitForConcurrentGcToComplete();
             dvmUnlockHeap();
             if (waited) {
                 // Just finished a GC, attempt to run finalizers.
                 dvmRunFinalization();
-                if (!dvmCheckException(self)) {
+                if (dvmCheckException(self)) {
                     return;
                 }
             }
@@ -1556,8 +1571,8 @@ void dvmHeapSourceRegisterNativeAllocation(int bytes)
                 dvmCollectGarbageInternal(GC_FOR_MALLOC);
                 dvmUnlockHeap();
                 dvmRunFinalization();
-
-                if (!dvmCheckException(self)) {
+                gHs->nativeNeedToRunFinalization = false;
+                if (dvmCheckException(self)) {
                     return;
                 }
             }