X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=vm%2FDdm.cpp;h=d441ec4625945b67a1df4896c120c6d8d5e11ef4;hb=c5d0614f778e0f26db913fdc7320f08e9417e984;hp=580fdfab7154a20981aef49addd0767761da4664;hpb=9cb2e378c890ad7a8b3b6ef394d77c067c31bd79;p=android-x86%2Fdalvik.git diff --git a/vm/Ddm.cpp b/vm/Ddm.cpp index 580fdfab7..d441ec462 100644 --- a/vm/Ddm.cpp +++ b/vm/Ddm.cpp @@ -61,7 +61,7 @@ bool dvmDdmHandlePacket(const u1* buf, int dataLen, u1** pReplyBuf, */ dataArray = dvmAllocPrimitiveArray('B', dataLen, ALLOC_DEFAULT); if (dataArray == NULL) { - LOGW("array alloc failed (%d)", dataLen); + ALOGW("array alloc failed (%d)", dataLen); dvmClearException(self); goto bail; } @@ -75,7 +75,7 @@ bool dvmDdmHandlePacket(const u1* buf, int dataLen, u1** pReplyBuf, length = get4BE((u1*)dataArray->contents + 4); offset = kChunkHdrLen; if (offset+length > (unsigned int) dataLen) { - LOGW("WARNING: bad chunk found (len=%u pktLen=%d)", length, dataLen); + ALOGW("WARNING: bad chunk found (len=%u pktLen=%d)", length, dataLen); goto bail; } @@ -86,7 +86,7 @@ bool dvmDdmHandlePacket(const u1* buf, int dataLen, u1** pReplyBuf, dvmCallMethod(self, gDvm.methDalvikDdmcServer_dispatch, NULL, &callRes, type, dataArray, offset, length); if (dvmCheckException(self)) { - LOGI("Exception thrown by dispatcher for 0x%08x", type); + ALOGI("Exception thrown by dispatcher for 0x%08x", type); dvmLogExceptionStackTrace(); dvmClearException(self); goto bail; @@ -124,7 +124,7 @@ bool dvmDdmHandlePacket(const u1* buf, int dataLen, u1** pReplyBuf, if (length == 0 || replyData == NULL) goto bail; if (offset + length > replyData->length) { - LOGW("WARNING: chunk off=%d len=%d exceeds reply array len %d", + ALOGW("WARNING: chunk off=%d len=%d exceeds reply array len %d", offset, length, replyData->length); goto bail; } @@ -132,7 +132,7 @@ bool dvmDdmHandlePacket(const u1* buf, int dataLen, u1** pReplyBuf, u1* reply; reply = (u1*) malloc(length + kChunkHdrLen); if (reply == NULL) { - LOGW("malloc %d failed", length+kChunkHdrLen); + ALOGW("malloc %d failed", length+kChunkHdrLen); goto bail; } set4BE(reply + 0, type); @@ -164,7 +164,7 @@ static void broadcast(int event) Thread* self = dvmThreadSelf(); if (self->status != THREAD_RUNNING) { - LOGE("ERROR: DDM broadcast with thread status=%d", self->status); + ALOGE("ERROR: DDM broadcast with thread status=%d", self->status); /* try anyway? */ } @@ -180,7 +180,7 @@ static void broadcast(int event) dvmCallMethod(self, gDvm.methDalvikDdmcServer_broadcast, NULL, &unused, event); if (dvmCheckException(self)) { - LOGI("Exception thrown by broadcast(%d)", event); + ALOGI("Exception thrown by broadcast(%d)", event); dvmLogExceptionStackTrace(); dvmClearException(self); return; @@ -230,7 +230,7 @@ void dvmDdmSetThreadNotification(bool enable) if (enable) { Thread* thread; for (thread = gDvm.threadList; thread != NULL; thread = thread->next) { - //LOGW("notify %d", thread->threadId); + //ALOGW("notify %d", thread->threadId); dvmDdmSendThreadNotification(thread, true); } } @@ -436,7 +436,7 @@ ArrayObject* dvmDdmGetStackTraceById(u4 threadId) break; } if (thread == NULL) { - LOGI("dvmDdmGetStackTraceById: threadid=%d not found", threadId); + ALOGI("dvmDdmGetStackTraceById: threadid=%d not found", threadId); dvmUnlockThreadList(); return NULL; }