am beeeb788: am 05fa5fd5: Merge "Simplify merges of the annotation code."

[android-x86/dalvik.git] / vm / Sync.cpp

diff --git a/vm/Sync.cpp b/vm/Sync.cpp
index 4010432..f42004c 100644 (file)
--- a/vm/Sync.cpp
+++ b/vm/Sync.cpp
@@ -98,11 +98,7 @@ Monitor* dvmCreateMonitor(Object* obj)
 
     mon = (Monitor*) calloc(1, sizeof(Monitor));
     if (mon == NULL) {
-        LOGE("Unable to allocate monitor");
-        dvmAbort();
-    }
-    if (((u4)mon & 7) != 0) {
-        LOGE("Misaligned monitor: %p", mon);
+        ALOGE("Unable to allocate monitor");
         dvmAbort();
     }
     mon->obj = obj;
@@ -276,6 +272,11 @@ static void logContentionEvent(Thread *self, u4 waitMs, u4 samplePercent,
     size_t len;
     int fd;
 
+    /* When a thread is being destroyed it is normal that the frame depth is zero */
+    if (self->interpSave.curFrame == NULL) {
+        return;
+    }
+
     saveArea = SAVEAREA_FROM_FP(self->interpSave.curFrame);
     meth = saveArea->method;
     cp = eventBuffer;
@@ -1365,7 +1366,7 @@ retry:
         dvmUnlockThreadList();
         goto retry;
     }
-    LOGE("object %p has an unknown hash state %#x", obj, hashState);
+    ALOGE("object %p has an unknown hash state %#x", obj, hashState);
     dvmDumpThread(dvmThreadSelf(), false);
     dvmAbort();
     return 0;  /* Quiet the compiler. */