diff options
| author | Steve Block <steveblock@google.com> | 2011-12-20 16:22:13 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-03 22:29:27 +0000 |
| commit | 062bf509a77fce9dfcb7e7b2e401cf2a124d83d5 (patch) | |
| tree | 6015cb53c42eb9ae2d13811da33381701a7c353a | |
| parent | 26f957278b34144a3f90989ccddb0102fc1fdd62 (diff) | |
| download | android_dalvik-062bf509a77fce9dfcb7e7b2e401cf2a124d83d5.tar.gz android_dalvik-062bf509a77fce9dfcb7e7b2e401cf2a124d83d5.tar.bz2 android_dalvik-062bf509a77fce9dfcb7e7b2e401cf2a124d83d5.zip | |
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: Ic663376d1ad6a6cb14bf81405ad9afd247cf2f60
63 files changed, 355 insertions, 355 deletions
diff --git a/dexopt/OptMain.cpp b/dexopt/OptMain.cpp index e0fdb6aa7..a3345b4c4 100644 --- a/dexopt/OptMain.cpp +++ b/dexopt/OptMain.cpp @@ -241,7 +241,7 @@ static int processZipFile(int zipFd, int cacheFd, const char* zipName, bcpCopy[matchOffset] = '\0'; bcp = bcpCopy; - LOGD("DexOptZ: truncated BOOTCLASSPATH to '%s'", bcp); + ALOGD("DexOptZ: truncated BOOTCLASSPATH to '%s'", bcp); isBootstrap = true; } diff --git a/libdex/DexFile.cpp b/libdex/DexFile.cpp index 4a2b47ee3..52bc500dd 100644 --- a/libdex/DexFile.cpp +++ b/libdex/DexFile.cpp @@ -516,7 +516,7 @@ size_t dexGetDexCodeSize(const DexCode* pCode) const u1* handlerData = dexGetCatchHandlerData(pCode); - //LOGD("+++ pCode=%p handlerData=%p last offset=%d", + //ALOGD("+++ pCode=%p handlerData=%p last offset=%d", // pCode, handlerData, offset); /* return the size of the catch handler + everything before it */ diff --git a/libdex/SysUtil.cpp b/libdex/SysUtil.cpp index 333016441..d5c952873 100644 --- a/libdex/SysUtil.cpp +++ b/libdex/SysUtil.cpp @@ -246,7 +246,7 @@ int sysMapFileInShmemWritableReadOnly(int fd, MemMapping* pMap) int err = errno; ALOGV("mprotect(%p, %d, PROT_READ) failed: %s", memPtr, length, strerror(err)); - LOGD("mprotect(RO) failed (%d), file will remain read-write", err); + ALOGD("mprotect(RO) failed (%d), file will remain read-write", err); } pMap->baseAddr = pMap->addr = memPtr; @@ -397,7 +397,7 @@ int sysWriteFully(int fd, const void* buf, size_t count, const char* logMsg) LOGE("%s: write failed: %s", logMsg, strerror(err)); return err; } else if (actual != (ssize_t) count) { - LOGD("%s: partial write (will retry): (%d of %zd)", + ALOGD("%s: partial write (will retry): (%d of %zd)", logMsg, (int) actual, count); buf = (const void*) (((const u1*) buf) + actual); } diff --git a/libdex/ZipArchive.cpp b/libdex/ZipArchive.cpp index 6e2aee732..75ee03123 100644 --- a/libdex/ZipArchive.cpp +++ b/libdex/ZipArchive.cpp @@ -170,7 +170,7 @@ static int mapCentralDirectory0(int fd, const char* debugFileName, } } if (i < 0) { - LOGD("Zip: EOCD not found, %s is not zip", debugFileName); + ALOGD("Zip: EOCD not found, %s is not zip", debugFileName); return -1; } diff --git a/vm/Debugger.cpp b/vm/Debugger.cpp index 9b5657b7b..d67df1e6e 100644 --- a/vm/Debugger.cpp +++ b/vm/Debugger.cpp @@ -425,7 +425,7 @@ void dvmDbgDisconnected() dvmHashTableLock(gDvm.dbgRegistry); gDvm.debuggerConnected = false; - LOGD("Debugger has detached; object registry had %d entries", + ALOGD("Debugger has detached; object registry had %d entries", dvmHashTableNumEntries(gDvm.dbgRegistry)); //int i; //for (i = 0; i < gDvm.dbgRegistryNext; i++) @@ -2808,7 +2808,7 @@ void dvmDbgExecuteMethod(DebugInvokeReq* pReq) pReq->resultTag = getReturnTypeBasicTag(meth); if (pReq->exceptObj != 0) { Object* exc = dvmGetException(self); - LOGD(" JDWP invocation returning with exceptObj=%p (%s)", + ALOGD(" JDWP invocation returning with exceptObj=%p (%s)", exc, exc->clazz->descriptor); //dvmLogExceptionStackTrace(); dvmClearException(self); diff --git a/vm/DvmDex.cpp b/vm/DvmDex.cpp index c1f67d47a..84f340746 100644 --- a/vm/DvmDex.cpp +++ b/vm/DvmDex.cpp @@ -244,14 +244,14 @@ bool dvmDexChangeDex1(DvmDex* pDvmDex, u1* addr, u1 newVal) ALOGV("+++ change byte at %p from 0x%02x to 0x%02x", addr, *addr, newVal); if (sysChangeMapAccess(addr, 1, true, &pDvmDex->memMap) != 0) { - LOGD("NOTE: DEX page access change (->RW) failed"); + ALOGD("NOTE: DEX page access change (->RW) failed"); /* expected on files mounted from FAT; keep going (may crash) */ } *addr = newVal; if (sysChangeMapAccess(addr, 1, false, &pDvmDex->memMap) != 0) { - LOGD("NOTE: DEX page access change (->RO) failed"); + ALOGD("NOTE: DEX page access change (->RO) failed"); /* expected on files mounted from FAT; keep going */ } @@ -281,14 +281,14 @@ bool dvmDexChangeDex2(DvmDex* pDvmDex, u2* addr, u2 newVal) ALOGV("+++ change 2byte at %p from 0x%04x to 0x%04x", addr, *addr, newVal); if (sysChangeMapAccess(addr, 2, true, &pDvmDex->memMap) != 0) { - LOGD("NOTE: DEX page access change (->RW) failed"); + ALOGD("NOTE: DEX page access change (->RW) failed"); /* expected on files mounted from FAT; keep going (may crash) */ } *addr = newVal; if (sysChangeMapAccess(addr, 2, false, &pDvmDex->memMap) != 0) { - LOGD("NOTE: DEX page access change (->RO) failed"); + ALOGD("NOTE: DEX page access change (->RO) failed"); /* expected on files mounted from FAT; keep going */ } diff --git a/vm/Exception.cpp b/vm/Exception.cpp index ac519a179..1a4fad5e0 100644 --- a/vm/Exception.cpp +++ b/vm/Exception.cpp @@ -681,7 +681,7 @@ static int findCatchInMethod(Thread* self, const Method* method, int relPc, } } - //LOGD("ADDR MATCH, check %s instanceof %s", + //ALOGD("ADDR MATCH, check %s instanceof %s", // excepClass->descriptor, pEntry->excepClass->descriptor); if (dvmInstanceof(excepClass, throwable)) { @@ -853,7 +853,7 @@ void* dvmFillInStackTraceInternal(Thread* thread, bool wantObject, size_t* pCoun break; if (!dvmInstanceof(method->clazz, gDvm.exThrowable)) break; - //LOGD("EXCEP: ignoring %s.%s", + //ALOGD("EXCEP: ignoring %s.%s", // method->clazz->descriptor, method->name); fp = saveArea->prevFrame; } @@ -872,7 +872,7 @@ void* dvmFillInStackTraceInternal(Thread* thread, bool wantObject, size_t* pCoun assert(fp != saveArea->prevFrame); fp = saveArea->prevFrame; } - //LOGD("EXCEP: stack depth is %d", stackDepth); + //ALOGD("EXCEP: stack depth is %d", stackDepth); if (!stackDepth) goto bail; @@ -908,7 +908,7 @@ void* dvmFillInStackTraceInternal(Thread* thread, bool wantObject, size_t* pCoun const Method* method = saveArea->method; if (!dvmIsBreakFrame((u4*)fp)) { - //LOGD("EXCEP keeping %s.%s", method->clazz->descriptor, + //ALOGD("EXCEP keeping %s.%s", method->clazz->descriptor, // method->name); *intPtr++ = (int) method; diff --git a/vm/Hash.cpp b/vm/Hash.cpp index 39d9d8622..a4591f18d 100644 --- a/vm/Hash.cpp +++ b/vm/Hash.cpp @@ -192,7 +192,7 @@ void* dvmHashTableLookup(HashTable* pHashTable, u4 itemHash, void* item, (*cmpFunc)(pEntry->data, item) == 0) { /* match */ - //LOGD("+++ match on entry %d", pEntry - pHashTable->pEntries); + //ALOGD("+++ match on entry %d", pEntry - pHashTable->pEntries); break; } diff --git a/vm/IndirectRefTable.cpp b/vm/IndirectRefTable.cpp index 508ae3d51..7712012e5 100644 --- a/vm/IndirectRefTable.cpp +++ b/vm/IndirectRefTable.cpp @@ -233,18 +233,18 @@ bool IndirectRefTable::remove(u4 cookie, IndirectRef iref) } if (index >= topIndex) { /* bad -- stale reference? */ - LOGD("Attempt to remove invalid index %ud (bottom=%ud top=%ud)", + ALOGD("Attempt to remove invalid index %ud (bottom=%ud top=%ud)", index, bottomIndex, topIndex); return false; } if (table_[index].obj == NULL) { - LOGD("Attempt to remove cleared %s reference %p", + ALOGD("Attempt to remove cleared %s reference %p", indirectRefKindToString(kind_), iref); return false; } u4 serial = extractSerial(iref); if (table_[index].serial != serial) { - LOGD("Attempt to remove stale %s reference %p", + ALOGD("Attempt to remove stale %s reference %p", indirectRefKindToString(kind_), iref); return false; } diff --git a/vm/Init.cpp b/vm/Init.cpp index b8fab49bf..7279a4f01 100644 --- a/vm/Init.cpp +++ b/vm/Init.cpp @@ -517,13 +517,13 @@ static bool enableAssertions(const char* pkgOrClass, bool enable) void dvmLateEnableAssertions() { if (gDvm.assertionCtrl == NULL) { - LOGD("Not late-enabling assertions: no assertionCtrl array"); + ALOGD("Not late-enabling assertions: no assertionCtrl array"); return; } else if (gDvm.assertionCtrlCount != 0) { - LOGD("Not late-enabling assertions: some asserts already configured"); + ALOGD("Not late-enabling assertions: some asserts already configured"); return; } - LOGD("Late-enabling assertions"); + ALOGD("Late-enabling assertions"); /* global enable for all but system */ AssertionControl* pCtrl = gDvm.assertionCtrl; @@ -1475,7 +1475,7 @@ bool dvmInitAfterZygote() * come last. */ if (!initJdwp()) { - LOGD("JDWP init failed; continuing anyway"); + ALOGD("JDWP init failed; continuing anyway"); } endJdwp = dvmGetRelativeTimeUsec(); @@ -1693,7 +1693,7 @@ void dvmShutdown() dvmSlayDaemons(); if (gDvm.verboseShutdown) - LOGD("VM cleaning up"); + ALOGD("VM cleaning up"); dvmDebuggerShutdown(); dvmProfilingShutdown(); diff --git a/vm/JarFile.cpp b/vm/JarFile.cpp index 2af34b8d0..a4affb83c 100644 --- a/vm/JarFile.cpp +++ b/vm/JarFile.cpp @@ -310,7 +310,7 @@ tryArchive: } endWhen = dvmGetRelativeTimeUsec(); - LOGD("DEX prep '%s': unzip in %dms, rewrite %dms", + ALOGD("DEX prep '%s': unzip in %dms, rewrite %dms", fileName, (int) (extractWhen - startWhen) / 1000, (int) (endWhen - extractWhen) / 1000); diff --git a/vm/Jni.cpp b/vm/Jni.cpp index f5b60058f..94c3199ba 100644 --- a/vm/Jni.cpp +++ b/vm/Jni.cpp @@ -171,10 +171,10 @@ static void checkStackSum(Thread* self) { if (crc != stackCrc) { const Method* meth = dvmGetCurrentJNIMethod(); if (dvmComputeExactFrameDepth(self->interpSave.curFrame) == 1) { - LOGD("JNI: bad stack CRC (0x%08x) -- okay during init", stackCrc); + ALOGD("JNI: bad stack CRC (0x%08x) -- okay during init", stackCrc); } else if (strcmp(meth->name, "nativeLoad") == 0 && (strcmp(meth->clazz->descriptor, "Ljava/lang/Runtime;") == 0)) { - LOGD("JNI: bad stack CRC (0x%08x) -- okay during JNI_OnLoad", stackCrc); + ALOGD("JNI: bad stack CRC (0x%08x) -- okay during JNI_OnLoad", stackCrc); } else { LOGW("JNI: bad stack CRC (%08x vs %08x)", crc, stackCrc); dvmAbort(); @@ -498,7 +498,7 @@ static jobject addGlobalReference(Object* obj) { int count = gDvm.jniGlobalRefTable.capacity(); // TODO: adjust for "holes" if (count > gDvm.jniGlobalRefHiMark) { - LOGD("GREF has increased to %d", count); + ALOGD("GREF has increased to %d", count); gDvm.jniGlobalRefHiMark += kGrefWaterInterval; gDvm.jniGlobalRefLoMark += kGrefWaterInterval; @@ -567,7 +567,7 @@ static void deleteGlobalReference(jobject jobj) { int count = gDvm.jniGlobalRefTable.capacity(); // TODO: not quite right, need to subtract holes if (count < gDvm.jniGlobalRefLoMark) { - LOGD("GREF has decreased to %d", count); + ALOGD("GREF has decreased to %d", count); gDvm.jniGlobalRefHiMark -= kGrefWaterInterval; gDvm.jniGlobalRefLoMark -= kGrefWaterInterval; } @@ -1641,9 +1641,9 @@ static jmethodID GetMethodID(JNIEnv* env, jclass jclazz, const char* name, const meth = dvmFindDirectMethodByDescriptor(clazz, name, sig); } if (meth != NULL && dvmIsStaticMethod(meth)) { - IF_LOGD() { + IF_ALOGD() { char* desc = dexProtoCopyMethodDescriptor(&meth->prototype); - LOGD("GetMethodID: not returning static method %s.%s %s", + ALOGD("GetMethodID: not returning static method %s.%s %s", clazz->descriptor, meth->name, desc); free(desc); } @@ -1702,9 +1702,9 @@ static jmethodID GetStaticMethodID(JNIEnv* env, jclass jclazz, const char* name, /* make sure it's static, not virtual+private */ if (meth != NULL && !dvmIsStaticMethod(meth)) { - IF_LOGD() { + IF_ALOGD() { char* desc = dexProtoCopyMethodDescriptor(&meth->prototype); - LOGD("GetStaticMethodID: not returning nonstatic method %s.%s %s", + ALOGD("GetStaticMethodID: not returning nonstatic method %s.%s %s", clazz->descriptor, meth->name, desc); free(desc); } @@ -2916,7 +2916,7 @@ static jint DestroyJavaVM(JavaVM* vm) { } if (gDvm.verboseShutdown) { - LOGD("DestroyJavaVM waiting for non-daemon threads to exit"); + ALOGD("DestroyJavaVM waiting for non-daemon threads to exit"); } /* @@ -2950,7 +2950,7 @@ shutdown: // (this may not return -- figure out how this should work) if (gDvm.verboseShutdown) { - LOGD("DestroyJavaVM shutting VM down"); + ALOGD("DestroyJavaVM shutting VM down"); } dvmShutdown(); @@ -3356,11 +3356,11 @@ void dvmLateEnableCheckedJni() { assert(extVm != NULL); if (!gDvmJni.useCheckJni) { - LOGD("Late-enabling CheckJNI"); + ALOGD("Late-enabling CheckJNI"); dvmUseCheckedJniVm(extVm); dvmUseCheckedJniEnv(extEnv); } else { - LOGD("Not late-enabling CheckJNI (already on)"); + ALOGD("Not late-enabling CheckJNI (already on)"); } } diff --git a/vm/LinearAlloc.cpp b/vm/LinearAlloc.cpp index 51c8fcd22..6e53ac632 100644 --- a/vm/LinearAlloc.cpp +++ b/vm/LinearAlloc.cpp @@ -238,7 +238,7 @@ void dvmLinearAllocDestroy(Object* classLoader) if (gDvm.verboseShutdown) { ALOGV("Unmapping linear allocator base=%p", pHdr->mapAddr); - LOGD("LinearAlloc %p used %d of %d (%d%%)", + ALOGD("LinearAlloc %p used %d of %d (%d%%)", classLoader, pHdr->curOffset, pHdr->mapLength, (pHdr->curOffset * 100) / pHdr->mapLength); } @@ -644,7 +644,7 @@ void dvmLinearAllocDump(Object* classLoader) printf(" %d-%d: zero\n", zstart, i-1); } - LOGD("LinearAlloc %p using %d of %d (%d%%)", + ALOGD("LinearAlloc %p using %d of %d (%d%%)", classLoader, pHdr->curOffset, pHdr->mapLength, (pHdr->curOffset * 100) / pHdr->mapLength); diff --git a/vm/Native.cpp b/vm/Native.cpp index ee64e782d..a616d1f6d 100644 --- a/vm/Native.cpp +++ b/vm/Native.cpp @@ -184,7 +184,7 @@ static int hashcmpSharedLib(const void* ventry, const void* vnewEntry) const SharedLib* pLib = (const SharedLib*) ventry; const SharedLib* pNewLib = (const SharedLib*) vnewEntry; - LOGD("--- comparing %p '%s' %p '%s'", + ALOGD("--- comparing %p '%s' %p '%s'", pLib, pLib->pathName, pNewLib, pNewLib->pathName); return strcmp(pLib->pathName, pNewLib->pathName); } @@ -279,7 +279,7 @@ static bool checkOnLoadResult(SharedLib* pEntry) dvmLockMutex(&pEntry->onLoadLock); while (pEntry->onLoadResult == kOnLoadPending) { - LOGD("threadid=%d: waiting for %s OnLoad status", + ALOGD("threadid=%d: waiting for %s OnLoad status", self->threadId, pEntry->pathName); ThreadStatus oldStatus = dvmChangeStatus(self, THREAD_VMWAIT); pthread_cond_wait(&pEntry->onLoadCond, &pEntry->onLoadLock); @@ -327,7 +327,7 @@ bool dvmLoadNativeCode(const char* pathName, Object* classLoader, verbose = verbose && !!strncmp(pathName, "/vendor", sizeof("/vendor")-1); if (verbose) - LOGD("Trying to load lib %s %p", pathName, classLoader); + ALOGD("Trying to load lib %s %p", pathName, classLoader); *detail = NULL; @@ -343,7 +343,7 @@ bool dvmLoadNativeCode(const char* pathName, Object* classLoader, return false; } if (verbose) { - LOGD("Shared lib '%s' already loaded in same CL %p", + ALOGD("Shared lib '%s' already loaded in same CL %p", pathName, classLoader); } if (!checkOnLoadResult(pEntry)) @@ -408,7 +408,7 @@ bool dvmLoadNativeCode(const char* pathName, Object* classLoader, return checkOnLoadResult(pActualEntry); } else { if (verbose) - LOGD("Added shared lib %s %p", pathName, classLoader); + ALOGD("Added shared lib %s %p", pathName, classLoader); bool result = true; void* vonLoad; @@ -416,7 +416,7 @@ bool dvmLoadNativeCode(const char* pathName, Object* classLoader, vonLoad = dlsym(handle, "JNI_OnLoad"); if (vonLoad == NULL) { - LOGD("No JNI_OnLoad found in %s %p, skipping init", + ALOGD("No JNI_OnLoad found in %s %p, skipping init", pathName, classLoader); } else { /* @@ -526,7 +526,7 @@ static void unregisterJNINativeMethods(Method* methods, size_t count) * anything. */ - LOGD("Unregistering JNI method %s.%s:%s", + ALOGD("Unregistering JNI method %s.%s:%s", meth->clazz->descriptor, meth->name, meth->shorty); dvmSetNativeFunc(meth, dvmResolveNativeMethod, NULL); } diff --git a/vm/PointerSet.cpp b/vm/PointerSet.cpp index 4f3d7d583..d0e209588 100644 --- a/vm/PointerSet.cpp +++ b/vm/PointerSet.cpp @@ -148,14 +148,14 @@ bool dvmPointerSetAddEntry(PointerSet* pSet, const void* ptr) * terminated "above" or "below" the value. */ if (nearby != 0 && ptr < pSet->list[nearby-1]) { - //LOGD("nearby-1=%d %p, inserting %p at -1", + //ALOGD("nearby-1=%d %p, inserting %p at -1", // nearby-1, pSet->list[nearby-1], ptr); nearby--; } else if (ptr < pSet->list[nearby]) { - //LOGD("nearby=%d %p, inserting %p at +0", + //ALOGD("nearby=%d %p, inserting %p at +0", // nearby, pSet->list[nearby], ptr); } else { - //LOGD("nearby+1=%d %p, inserting %p at +1", + //ALOGD("nearby+1=%d %p, inserting %p at +1", // nearby+1, pSet->list[nearby+1], ptr); nearby++; } diff --git a/vm/Profile.cpp b/vm/Profile.cpp index 6ada939f7..07de0985c 100644 --- a/vm/Profile.cpp +++ b/vm/Profile.cpp @@ -263,7 +263,7 @@ static void updateActiveProfilers(ExecutionSubModes newMode, bool enable) dvmCompilerUpdateGlobalState(); #endif - LOGD("+++ active profiler count now %d", newValue); + ALOGD("+++ active profiler count now %d", newValue); } @@ -562,7 +562,7 @@ void dvmMethodTraceStop() if (!state->traceEnabled) { /* somebody already stopped it, or it was never started */ - LOGD("TRACE stop requested, but not running"); + ALOGD("TRACE stop requested, but not running"); dvmUnlockMutex(&state->startStopLock); return; } else { @@ -943,7 +943,7 @@ void dvmEmulatorTraceStart() /* in theory we should make this an atomic inc; in practice not important */ gDvm.emulatorTraceEnableCount++; if (gDvm.emulatorTraceEnableCount == 1) - LOGD("--- emulator method traces enabled"); + ALOGD("--- emulator method traces enabled"); updateActiveProfilers(kSubModeEmulatorTrace, true); } @@ -959,7 +959,7 @@ void dvmEmulatorTraceStop() /* in theory we should make this an atomic inc; in practice not important */ gDvm.emulatorTraceEnableCount--; if (gDvm.emulatorTraceEnableCount == 0) - LOGD("--- emulator method traces disabled"); + ALOGD("--- emulator method traces disabled"); updateActiveProfilers(kSubModeEmulatorTrace, (gDvm.emulatorTraceEnableCount != 0)); } diff --git a/vm/RawDexFile.cpp b/vm/RawDexFile.cpp index 53a84240a..1dc12c932 100644 --- a/vm/RawDexFile.cpp +++ b/vm/RawDexFile.cpp @@ -199,7 +199,7 @@ int dvmRawDexFileOpen(const char* fileName, const char* odexOutputName, } endWhen = dvmGetRelativeTimeUsec(); - LOGD("DEX prep '%s': copy in %dms, rewrite %dms", + ALOGD("DEX prep '%s': copy in %dms, rewrite %dms", fileName, (int) (copyWhen - startWhen) / 1000, (int) (endWhen - copyWhen) / 1000); @@ -251,7 +251,7 @@ int dvmRawDexFileOpenArray(u1* pBytes, u4 length, RawDexFile** ppRawDexFile) DvmDex* pDvmDex = NULL; if (!dvmPrepareDexInMemory(pBytes, length, &pDvmDex)) { - LOGD("Unable to open raw DEX from array"); + ALOGD("Unable to open raw DEX from array"); return -1; } assert(pDvmDex != NULL); diff --git a/vm/SignalCatcher.cpp b/vm/SignalCatcher.cpp index a0d5d89b8..376835788 100644 --- a/vm/SignalCatcher.cpp +++ b/vm/SignalCatcher.cpp @@ -239,7 +239,7 @@ static void handleSigUsr2() dvmCompilerDumpStats(); /* Stress-test unchain all */ dvmJitUnchainAll(); - LOGD("Send %d more signals to reset the code cache", + ALOGD("Send %d more signals to reset the code cache", codeCacheResetCount & 7); } dvmCheckInterpStateConsistency(); diff --git a/vm/StdioConverter.cpp b/vm/StdioConverter.cpp index ffb1d0ef7..003a6ef96 100644 --- a/vm/StdioConverter.cpp +++ b/vm/StdioConverter.cpp @@ -117,7 +117,7 @@ void dvmStdioConverterShutdown() printf("Shutting down\n"); fflush(stdout); - LOGD("Joining stdio converter..."); + ALOGD("Joining stdio converter..."); pthread_join(gDvm.stdioConverterHandle, NULL); } @@ -166,9 +166,9 @@ static void* stdioConverterThreadStart(void* arg) LOGE("select on stdout/stderr failed"); break; } - LOGD("Got EINTR, ignoring"); + ALOGD("Got EINTR, ignoring"); } else if (fdCount == 0) { - LOGD("WEIRD: select returned zero"); + ALOGD("WEIRD: select returned zero"); } else { bool err = false; if (FD_ISSET(gDvm.stdoutPipe[0], &readfds)) { diff --git a/vm/Thread.cpp b/vm/Thread.cpp index adc46af5f..6ae23c711 100644 --- a/vm/Thread.cpp +++ b/vm/Thread.cpp @@ -58,7 +58,7 @@ pid_t gettid() { return syscall(__NR_gettid);} // Change this to enable logging on cgroup errors #define ENABLE_CGROUP_ERR_LOGGING 0 -// change this to ALOGV/LOGD to debug thread activity +// change this to ALOGV/ALOGD to debug thread activity #define LOG_THREAD LOGVV /* @@ -608,7 +608,7 @@ void dvmSlayDaemons() if (target->status == THREAD_RUNNING) { if (!complained) - LOGD("threadid=%d not ready yet", target->threadId); + ALOGD("threadid=%d not ready yet", target->threadId); allSuspended = false; /* keep going so we log each running daemon once */ } @@ -622,7 +622,7 @@ void dvmSlayDaemons() } else { if (!complained) { complained = true; - LOGD("threadid=%d: waiting briefly for daemon suspension", + ALOGD("threadid=%d: waiting briefly for daemon suspension", threadId); } } @@ -1070,7 +1070,7 @@ static void threadExitCheck(void* arg) /* * Spin a couple of times to let other destructors fire. */ - LOGD("threadid=%d: thread exiting, not yet detached (count=%d)", + ALOGD("threadid=%d: thread exiting, not yet detached (count=%d)", self->threadId, self->threadExitCheckCount); self->threadExitCheckCount++; int cc = pthread_setspecific(gDvm.pthreadKeySelf, self); @@ -1207,7 +1207,7 @@ static void setThreadName(const char *threadName) #elif defined(HAVE_PRCTL) prctl(PR_SET_NAME, (unsigned long) s, 0, 0, 0); #else - LOGD("No way to set current thread's name (%s)", s); + ALOGD("No way to set current thread's name (%s)", s); #endif } @@ -2280,7 +2280,7 @@ void dvmSuspendSelf(bool jdwpActivity) * dump event is pending (assuming SignalCatcher was resumed for * just long enough to try to grab the thread-suspend lock). */ - LOGD("threadid=%d: still suspended after undo (sc=%d dc=%d)", + ALOGD("threadid=%d: still suspended after undo (sc=%d dc=%d)", self->threadId, self->suspendCount, self->dbgSuspendCount); } } @@ -2342,7 +2342,7 @@ int dvmRaiseThreadPriorityIfNeeded(Thread* thread, int* pSavedThreadPrio, LOGW("Couldn't set fg policy on tid %d", thread->systemTid); } else { changeFlags |= kChangedPolicy; - LOGD("Temporarily moving tid %d to fg (was %d)", + ALOGD("Temporarily moving tid %d to fg (was %d)", thread->systemTid, *pSavedThreadPolicy); } } @@ -2358,7 +2358,7 @@ int dvmRaiseThreadPriorityIfNeeded(Thread* thread, int* pSavedThreadPrio, thread->systemTid, kHigher); } else { changeFlags |= kChangedPriority; - LOGD("Temporarily raised priority on tid %d (%d -> %d)", + ALOGD("Temporarily raised priority on tid %d (%d -> %d)", thread->systemTid, *pSavedThreadPrio, kHigher); } } @@ -2377,7 +2377,7 @@ void dvmResetThreadPriority(Thread* thread, int changeFlags, LOGW("NOTE: couldn't reset tid %d to (%d)", thread->systemTid, savedThreadPolicy); } else { - LOGD("Restored policy of %d to %d", + ALOGD("Restored policy of %d to %d", thread->systemTid, savedThreadPolicy); } } @@ -2388,7 +2388,7 @@ void dvmResetThreadPriority(Thread* thread, int changeFlags, LOGW("NOTE: couldn't reset priority on thread %d to %d", thread->systemTid, savedThreadPrio); } else { - LOGD("Restored priority on %d to %d", + ALOGD("Restored priority on %d to %d", thread->systemTid, savedThreadPrio); } } @@ -2461,7 +2461,7 @@ static void waitForThreadSuspend(Thread* self, Thread* thread) */ if (gDvmJit.pJitEntryTable && retryCount > 0 && gDvmJit.hasNewChain && thread->inJitCodeCache) { - LOGD("JIT unchain all for threadid=%d", thread->threadId); + ALOGD("JIT unchain all for threadid=%d", thread->threadId); dvmJitUnchainAll(); } #endif @@ -3537,22 +3537,22 @@ void dvmNukeThread(Thread* thread) * The target thread can continue to execute between the two signals. * (The first just causes debuggerd to attach to it.) */ - LOGD("threadid=%d: sending two SIGSTKFLTs to threadid=%d (tid=%d) to" + ALOGD("threadid=%d: sending two SIGSTKFLTs to threadid=%d (tid=%d) to" " cause debuggerd dump", dvmThreadSelf()->threadId, thread->threadId, thread->systemTid); killResult = pthread_kill(thread->handle, SIGSTKFLT); if (killResult != 0) { - LOGD("NOTE: pthread_kill #1 failed: %s", strerror(killResult)); + ALOGD("NOTE: pthread_kill #1 failed: %s", strerror(killResult)); } usleep(2 * 1000 * 1000); // TODO: timed-wait until debuggerd attaches killResult = pthread_kill(thread->handle, SIGSTKFLT); if (killResult != 0) { - LOGD("NOTE: pthread_kill #2 failed: %s", strerror(killResult)); + ALOGD("NOTE: pthread_kill #2 failed: %s", strerror(killResult)); } - LOGD("Sent, pausing to let debuggerd run"); + ALOGD("Sent, pausing to let debuggerd run"); usleep(8 * 1000 * 1000); // TODO: timed-wait until debuggerd finishes /* ignore SIGSEGV so the eventual dmvAbort() doesn't notify debuggerd */ signal(SIGSEGV, SIG_IGN); - LOGD("Continuing"); + ALOGD("Continuing"); } diff --git a/vm/alloc/CardTable.cpp b/vm/alloc/CardTable.cpp index 333b9f919..da395e77d 100644 --- a/vm/alloc/CardTable.cpp +++ b/vm/alloc/CardTable.cpp @@ -277,7 +277,7 @@ static void dumpReferencesCallback(Object *obj, void *arg) } dvmVisitObject(dumpReferencesVisitor, obj, &arg); if (arg == NULL) { - LOGD("Found %p in the heap @ %p", arg, obj); + ALOGD("Found %p in the heap @ %p", arg, obj); dvmDumpObject(obj); } } @@ -291,7 +291,7 @@ static void dumpReferencesRootVisitor(void *ptr, u4 threadId, Object *obj = *(Object **)ptr; Object *lookingFor = *(Object **)arg; if (obj == lookingFor) { - LOGD("Found %p in a root @ %p", arg, ptr); + ALOGD("Found %p in a root @ %p", arg, ptr); } } diff --git a/vm/alloc/Copying.cpp b/vm/alloc/Copying.cpp index 6d219ecb5..566b371e5 100644 --- a/vm/alloc/Copying.cpp +++ b/vm/alloc/Copying.cpp @@ -1685,7 +1685,7 @@ static void scavengeThreadStack(Thread *thread) #if WITH_EXTRA_GC_CHECKS > 1 if (dvmIsValidObject((Object*) rval)) { /* this is normal, but we feel chatty */ - LOGD("PGC: ignoring valid ref in reg %d: 0x%08x", + ALOGD("PGC: ignoring valid ref in reg %d: 0x%08x", method->registersSize-1 - i, rval); } #endif diff --git a/vm/alloc/Heap.cpp b/vm/alloc/Heap.cpp index 4043840c8..8a3c67385 100644 --- a/vm/alloc/Heap.cpp +++ b/vm/alloc/Heap.cpp @@ -656,7 +656,7 @@ void dvmCollectGarbageInternal(const GcSpec* spec) if (!spec->isConcurrent) { u4 markSweepTime = dirtyEnd - rootStart; bool isSmall = numBytesFreed > 0 && numBytesFreed < 1024; - LOGD("%s freed %s%zdK, %d%% free %zdK/%zdK, paused %ums", + ALOGD("%s freed %s%zdK, %d%% free %zdK/%zdK, paused %ums", spec->reason, isSmall ? "<" : "", numBytesFreed ? MAX(numBytesFreed / 1024, 1) : 0, @@ -667,7 +667,7 @@ void dvmCollectGarbageInternal(const GcSpec* spec) u4 rootTime = rootEnd - rootStart; u4 dirtyTime = dirtyEnd - dirtyStart; bool isSmall = numBytesFreed > 0 && numBytesFreed < 1024; - LOGD("%s freed %s%zdK, %d%% free %zdK/%zdK, paused %ums+%ums", + ALOGD("%s freed %s%zdK, %d%% free %zdK/%zdK, paused %ums+%ums", spec->reason, isSmall ? "<" : "", numBytesFreed ? MAX(numBytesFreed / 1024, 1) : 0, diff --git a/vm/alloc/Verify.cpp b/vm/alloc/Verify.cpp index 6d830c7d7..31998f898 100644 --- a/vm/alloc/Verify.cpp +++ b/vm/alloc/Verify.cpp @@ -45,7 +45,7 @@ static void dumpReferencesCallback(Object *obj, void *arg) } dvmVisitObject(dumpReferencesVisitor, obj, &arg); if (arg == NULL) { - LOGD("Found %p in the heap @ %p", arg, obj); + ALOGD("Found %p in the heap @ %p", arg, obj); dvmDumpObject(obj); } } @@ -60,7 +60,7 @@ static void dumpReferencesRootVisitor(void *ptr, u4 threadId, Object *obj = *(Object **)ptr; Object *lookingFor = *(Object **)arg; if (obj == lookingFor) { - LOGD("Found %p in a root @ %p", arg, ptr); + ALOGD("Found %p in a root @ %p", arg, ptr); } } diff --git a/vm/analysis/CodeVerify.cpp b/vm/analysis/CodeVerify.cpp index 79527d3c1..6c9121192 100644 --- a/vm/analysis/CodeVerify.cpp +++ b/vm/analysis/CodeVerify.cpp @@ -1589,7 +1589,7 @@ static void verifyRegisterType(RegisterLine* registerLine, u4 vsrc, const RegType* insnRegs = registerLine->regTypes; RegType srcType = insnRegs[vsrc]; - //LOGD("check-reg v%u = %d", vsrc, checkType); + //ALOGD("check-reg v%u = %d", vsrc, checkType); switch (checkType) { case kRegTypeFloat: case kRegTypeBoolean: @@ -1742,7 +1742,7 @@ static void markRefsAsInitialized(RegisterLine* registerLine, int insnRegCount, changed++; } } - //LOGD("VFY: marked %d registers as initialized", changed); + //ALOGD("VFY: marked %d registers as initialized", changed); assert(changed > 0); return; @@ -1772,7 +1772,7 @@ static void markUninitRefsAsInvalid(RegisterLine* registerLine, } //if (changed) - // LOGD("VFY: marked %d uninitialized registers as invalid", changed); + // ALOGD("VFY: marked %d uninitialized registers as invalid", changed); } /* @@ -3146,7 +3146,7 @@ static bool initRegisterTable(const VerifierData* vdata, storage = assignLineStorage(storage, ®Table->savedLine, trackMonitors, regTypeSize, monEntSize, stackSize); - //LOGD("Tracking registers for [%d], total %d in %d units", + //ALOGD("Tracking registers for [%d], total %d in %d units", // trackRegsFor, interestingCount-kExtraLines, insnsSize); assert(storage - (u1*)regTable->lineAlloc == @@ -3248,7 +3248,7 @@ static bool replaceFailingInstruction(const Method* meth, InsnFlags* insnFlags, bool result = false; if (gDvm.optimizing) - LOGD("Weird: RFI during dexopt?"); + ALOGD("Weird: RFI during dexopt?"); /* * Generate the new instruction out of the old. @@ -3765,7 +3765,7 @@ static bool doCodeVerification(VerifierData* vdata, RegisterTable* regTable) if (!verifyInstruction(meth, insnFlags, regTable, insnIdx, uninitMap, &startGuess)) { - //LOGD("+++ %s bailing at %d", meth->name, insnIdx); + //ALOGD("+++ %s bailing at %d", meth->name, insnIdx); goto bail; } @@ -3809,10 +3809,10 @@ static bool doCodeVerification(VerifierData* vdata, RegisterTable* regTable) if (deadStart < 0) deadStart = insnIdx; } else if (deadStart >= 0) { - IF_LOGD() { + IF_ALOGD() { char* desc = dexProtoCopyMethodDescriptor(&meth->prototype); - LOGD("VFY: dead code 0x%04x-%04x in %s.%s %s", + ALOGD("VFY: dead code 0x%04x-%04x in %s.%s %s", deadStart, insnIdx-1, meth->clazz->descriptor, meth->name, desc); free(desc); @@ -3822,9 +3822,9 @@ static bool doCodeVerification(VerifierData* vdata, RegisterTable* regTable) } } if (deadStart >= 0) { - IF_LOGD() { + IF_ALOGD() { char* desc = dexProtoCopyMethodDescriptor(&meth->prototype); - LOGD("VFY: dead code 0x%04x-%04x in %s.%s %s", + ALOGD("VFY: dead code 0x%04x-%04x in %s.%s %s", deadStart, insnIdx-1, meth->clazz->descriptor, meth->name, desc); free(desc); @@ -6146,7 +6146,7 @@ sput_1nr_common: goto bail; } else { /* replace opcode and continue on */ - LOGD("VFY: replacing opcode 0x%02x at 0x%04x", + ALOGD("VFY: replacing opcode 0x%02x at 0x%04x", decInsn.opcode, insnIdx); if (!replaceFailingInstruction(meth, insnFlags, insnIdx, failure)) { LOG_VFY_METH(meth, "VFY: rejecting opcode 0x%02x at 0x%04x", diff --git a/vm/analysis/DexPrepare.cpp b/vm/analysis/DexPrepare.cpp index 6d55c03f4..53922b68e 100644 --- a/vm/analysis/DexPrepare.cpp +++ b/vm/analysis/DexPrepare.cpp @@ -168,7 +168,7 @@ retry: ThreadStatus oldStatus = dvmChangeStatus(NULL, THREAD_VMWAIT); cc = flock(fd, LOCK_EX | LOCK_NB); if (cc != 0) { - LOGD("DexOpt: sleeping on flock(%s)", cacheFileName); + ALOGD("DexOpt: sleeping on flock(%s)", cacheFileName); cc = flock(fd, LOCK_EX); } dvmChangeStatus(NULL, oldStatus); @@ -196,7 +196,7 @@ retry: if (cc != 0 || fdStat.st_dev != fileStat.st_dev || fdStat.st_ino != fileStat.st_ino) { - LOGD("DexOpt: our open cache file is stale; sleeping and retrying"); + ALOGD("DexOpt: our open cache file is stale; sleeping and retrying"); LOGVV("DexOpt: unlocking cache file %s", cacheFileName); flock(fd, LOCK_UN); close(fd); @@ -282,7 +282,7 @@ retry: * changes doing anything" purposes its best if we just make * everything crash when a DEX they're using gets updated. */ - LOGD("ODEX file is stale or bad; removing and retrying (%s)", + ALOGD("ODEX file is stale or bad; removing and retrying (%s)", cacheFileName); if (ftruncate(fd, 0) != 0) { LOGW("Warning: unable to truncate cache file '%s': %s", @@ -357,7 +357,7 @@ bool dvmOptimizeDexFile(int fd, off_t dexOffset, long dexLength, else lastPart = fileName; - LOGD("DexOpt: --- BEGIN '%s' (bootstrap=%d) ---", lastPart, isBootstrap); + ALOGD("DexOpt: --- BEGIN '%s' (bootstrap=%d) ---", lastPart, isBootstrap); pid_t pid; @@ -488,7 +488,7 @@ bool dvmOptimizeDexFile(int fd, off_t dexOffset, long dexLength, while (true) { gotPid = waitpid(pid, &status, 0); if (gotPid == -1 && errno == EINTR) { - LOGD("waitpid interrupted, retrying"); + ALOGD("waitpid interrupted, retrying"); } else { break; } @@ -501,7 +501,7 @@ bool dvmOptimizeDexFile(int fd, off_t dexOffset, long dexLength, } if (WIFEXITED(status) && WEXITSTATUS(status) == 0) { - LOGD("DexOpt: --- END '%s' (success) ---", lastPart); + ALOGD("DexOpt: --- END '%s' (success) ---", lastPart); return true; } else { LOGW("DexOpt: --- END '%s' --- status=0x%04x, process failed", @@ -870,7 +870,7 @@ static bool rewriteDex(u1* addr, int len, bool doVerify, bool doOpt, msgStr = "verify"; else if (doOpt) msgStr = "opt"; - LOGD("DexOpt: load %dms, %s %dms", + ALOGD("DexOpt: load %dms, %s %dms", (int) (loadWhen - prepWhen) / 1000, msgStr, (int) (verifyOptWhen - loadWhen) / 1000); @@ -979,7 +979,7 @@ static bool loadAllClasses(DvmDex* pDvmDex) * with the "multiple def" flag so the resolver doesn't try * to make it available. */ - LOGD("DexOpt: '%s' has an earlier definition; blocking out", + ALOGD("DexOpt: '%s' has an earlier definition; blocking out", classDescriptor); SET_CLASS_FLAG(newClass, CLASS_MULTIPLE_DEFS); } else { @@ -1053,7 +1053,7 @@ static void verifyAndOptimizeClass(DexFile* pDexFile, ClassObject* clazz, * (a) not the one we want to examine, and (b) mapped read-only, * so we will seg fault if we try to rewrite instructions inside it. */ - LOGD("DexOpt: not verifying/optimizing '%s': multiple definitions", + ALOGD("DexOpt: not verifying/optimizing '%s': multiple definitions", clazz->descriptor); return; } @@ -1202,11 +1202,11 @@ bool dvmCheckOptHeaderAndDependencies(int fd, bool sourceAvail, u4 modWhen, magic = optHdr.magic; if (memcmp(magic, DEX_MAGIC, 4) == 0) { /* somebody probably pointed us at the wrong file */ - LOGD("DexOpt: expected optimized DEX, found unoptimized"); + ALOGD("DexOpt: expected optimized DEX, found unoptimized"); goto bail; } else if (memcmp(magic, DEX_OPT_MAGIC, 4) != 0) { /* not a DEX file, or previous attempt was interrupted */ - LOGD("DexOpt: incorrect opt magic number (0x%02x %02x %02x %02x)", + ALOGD("DexOpt: incorrect opt magic number (0x%02x %02x %02x %02x)", magic[0], magic[1], magic[2], magic[3]); goto bail; } @@ -1283,7 +1283,7 @@ bool dvmCheckOptHeaderAndDependencies(int fd, bool sourceAvail, u4 modWhen, } val = read4LE(&ptr); if (val != DALVIK_VM_BUILD) { - LOGD("DexOpt: VM build version mismatch (%d vs %d)", + ALOGD("DexOpt: VM build version mismatch (%d vs %d)", val, DALVIK_VM_BUILD); goto bail; } diff --git a/vm/analysis/DexVerify.cpp b/vm/analysis/DexVerify.cpp index 172a22723..7623aa1a8 100644 --- a/vm/analysis/DexVerify.cpp +++ b/vm/analysis/DexVerify.cpp @@ -42,7 +42,7 @@ bool dvmVerifyClass(ClassObject* clazz) int i; if (dvmIsClassVerified(clazz)) { - LOGD("Ignoring duplicate verify attempt on %s", clazz->descriptor); + ALOGD("Ignoring duplicate verify attempt on %s", clazz->descriptor); return true; } @@ -324,7 +324,7 @@ static bool verifyMethod(Method* meth) * that's so rare that there's little point in checking. */ if (!dvmVerifyCodeFlow(&vdata)) { - //LOGD("+++ %s failed code flow", meth->name); + //ALOGD("+++ %s failed code flow", meth->name); goto bail; } diff --git a/vm/analysis/Optimize.cpp b/vm/analysis/Optimize.cpp index e8f136667..ed23d8f21 100644 --- a/vm/analysis/Optimize.cpp +++ b/vm/analysis/Optimize.cpp @@ -619,7 +619,7 @@ InstField* dvmOptResolveInstField(ClassObject* referrer, u4 ifieldIdx, dexStringById(pDvmDex->pDexFile, pFieldId->nameIdx), dexStringByTypeIdx(pDvmDex->pDexFile, pFieldId->typeIdx)); if (resField == NULL) { - LOGD("DexOpt: couldn't find field %s.%s", + ALOGD("DexOpt: couldn't find field %s.%s", resClass->descriptor, dexStringById(pDvmDex->pDexFile, pFieldId->nameIdx)); if (pFailure != NULL) @@ -627,7 +627,7 @@ InstField* dvmOptResolveInstField(ClassObject* referrer, u4 ifieldIdx, return NULL; } if (dvmIsStaticField(resField)) { - LOGD("DexOpt: wanted instance, got static for field %s.%s", + ALOGD("DexOpt: wanted instance, got static for field %s.%s", resClass->descriptor, dexStringById(pDvmDex->pDexFile, pFieldId->nameIdx)); if (pFailure != NULL) @@ -694,14 +694,14 @@ StaticField* dvmOptResolveStaticField(ClassObject* referrer, u4 sfieldIdx, resField = (StaticField*)dvmFindFieldHier(resClass, fieldName, dexStringByTypeIdx(pDvmDex->pDexFile, pFieldId->typeIdx)); if (resField == NULL) { - LOGD("DexOpt: couldn't find static field %s.%s", + ALOGD("DexOpt: couldn't find static field %s.%s", resClass->descriptor, fieldName); if (pFailure != NULL) *pFailure = VERIFY_ERROR_NO_FIELD; return NULL; } if (!dvmIsStaticField(resField)) { - LOGD("DexOpt: wanted static, got instance for field %s.%s", + ALOGD("DexOpt: wanted static, got instance for field %s.%s", resClass->descriptor, fieldName); if (pFailure != NULL) *pFailure = VERIFY_ERROR_CLASS_CHANGE; @@ -934,7 +934,7 @@ Method* dvmOptResolveMethod(ClassObject* referrer, u4 methodIdx, } if (methodType == METHOD_STATIC) { if (!dvmIsStaticMethod(resMethod)) { - LOGD("DexOpt: wanted static, got instance for method %s.%s", + ALOGD("DexOpt: wanted static, got instance for method %s.%s", resClass->descriptor, resMethod->name); if (pFailure != NULL) *pFailure = VERIFY_ERROR_CLASS_CHANGE; @@ -942,7 +942,7 @@ Method* dvmOptResolveMethod(ClassObject* referrer, u4 methodIdx, } } else if (methodType == METHOD_VIRTUAL) { if (dvmIsStaticMethod(resMethod)) { - LOGD("DexOpt: wanted instance, got static for method %s.%s", + ALOGD("DexOpt: wanted instance, got static for method %s.%s", resClass->descriptor, resMethod->name); if (pFailure != NULL) *pFailure = VERIFY_ERROR_CLASS_CHANGE; @@ -1011,7 +1011,7 @@ static void rewriteVirtualInvoke(Method* method, u2* insns, Opcode newOpc) baseMethod = dvmOptResolveMethod(clazz, methodIdx, METHOD_VIRTUAL, NULL); if (baseMethod == NULL) { - LOGD("DexOpt: unable to optimize virt call 0x%04x at 0x%02x in %s.%s", + ALOGD("DexOpt: unable to optimize virt call 0x%04x at 0x%02x in %s.%s", methodIdx, (int) (insns - method->insns), clazz->descriptor, method->name); @@ -1056,7 +1056,7 @@ static bool rewriteInvokeObjectInit(Method* method, u2* insns) calledMethod = dvmOptResolveMethod(clazz, methodIdx, METHOD_DIRECT, NULL); if (calledMethod == NULL) { - LOGD("DexOpt: unable to opt direct call 0x%04x at 0x%02x in %s.%s", + ALOGD("DexOpt: unable to opt direct call 0x%04x at 0x%02x in %s.%s", methodIdx, (int) (insns - method->insns), clazz->descriptor, method->name); return false; @@ -1101,7 +1101,7 @@ static bool rewriteJumboInvokeObjectInit(Method* method, u2* insns) calledMethod = dvmOptResolveMethod(clazz, methodIdx, METHOD_DIRECT, NULL); if (calledMethod == NULL) { - LOGD("DexOpt: unable to opt direct call 0x%04x at 0x%02x in %s.%s", + ALOGD("DexOpt: unable to opt direct call 0x%04x at 0x%02x in %s.%s", methodIdx, (int) (insns - method->insns), clazz->descriptor, method->name); return false; diff --git a/vm/analysis/RegisterMap.cpp b/vm/analysis/RegisterMap.cpp index 3b81672ff..21b60ef3b 100644 --- a/vm/analysis/RegisterMap.cpp +++ b/vm/analysis/RegisterMap.cpp @@ -316,7 +316,7 @@ RegisterMap* dvmGenerateRegisterMapV(VerifierData* vdata) } if (REGISTER_MAP_VERBOSE) { - LOGD("Good compress on %s.%s", + ALOGD("Good compress on %s.%s", vdata->method->clazz->descriptor, vdata->method->name); } @@ -324,7 +324,7 @@ RegisterMap* dvmGenerateRegisterMapV(VerifierData* vdata) pMap = pCompMap; } else { if (REGISTER_MAP_VERBOSE) { - LOGD("Unable to compress %s.%s (ent=%d rw=%d)", + ALOGD("Unable to compress %s.%s (ent=%d rw=%d)", vdata->method->clazz->descriptor, vdata->method->name, dvmRegisterMapGetNumEntries(pMap), @@ -453,7 +453,7 @@ static void dumpRegisterMap(const RegisterMap* pMap, int registersSize) } hexBuf[i * 3] = '\0'; - LOGD(" %04x %s %s", addr, outBuf, hexBuf); + ALOGD(" %04x %s %s", addr, outBuf, hexBuf); } } @@ -1023,10 +1023,10 @@ const RegisterMap* dvmGetExpandedRegisterMap0(Method* method) case kRegMapFormatCompact16: if (REGISTER_MAP_VERBOSE) { if (dvmRegisterMapGetOnHeap(curMap)) { - LOGD("RegMap: already expanded: %s.%s", + ALOGD("RegMap: already expanded: %s.%s", method->clazz->descriptor, method->name); } else { - LOGD("RegMap: stored w/o compression: %s.%s", + ALOGD("RegMap: stored w/o compression: %s.%s", method->clazz->descriptor, method->name); } } @@ -1054,7 +1054,7 @@ const RegisterMap* dvmGetExpandedRegisterMap0(Method* method) MapStats* pStats = (MapStats*) gDvm.registerMapStats; pStats->numExpandedMaps++; pStats->totalExpandedMapSize += computeRegisterMapSize(newMap); - LOGD("RMAP: count=%d size=%d", + ALOGD("RMAP: count=%d size=%d", pStats->numExpandedMaps, pStats->totalExpandedMapSize); } #endif @@ -1628,7 +1628,7 @@ static RegisterMap* compressMapDifferential(const RegisterMap* pMap, */ if (tmpPtr - tmpBuf.get() >= origSize) { if (debug) { - LOGD("Compressed size >= original (%d vs %d): %s.%s", + ALOGD("Compressed size >= original (%d vs %d): %s.%s", tmpPtr - tmpBuf.get(), origSize, meth->clazz->descriptor, meth->name); } @@ -1649,7 +1649,7 @@ static RegisterMap* compressMapDifferential(const RegisterMap* pMap, newMapSize = kHeaderSize + unsignedLeb128Size(newDataSize) + newDataSize; if (newMapSize >= origSize) { if (debug) { - LOGD("Final comp size >= original (%d vs %d): %s.%s", + ALOGD("Final comp size >= original (%d vs %d): %s.%s", newMapSize, origSize, meth->clazz->descriptor, meth->name); } return NULL; @@ -1668,7 +1668,7 @@ static RegisterMap* compressMapDifferential(const RegisterMap* pMap, memcpy(tmpPtr, tmpBuf.get(), newDataSize); if (REGISTER_MAP_VERBOSE) { - LOGD("Compression successful (%d -> %d) from aw=%d rw=%d ne=%d", + ALOGD("Compression successful (%d -> %d) from aw=%d rw=%d ne=%d", computeRegisterMapSize(pMap), computeRegisterMapSize(pNewMap), addrWidth, regWidth, numEntries); } @@ -1825,7 +1825,7 @@ static RegisterMap* uncompressMapDifferential(const RegisterMap* pMap) } if (REGISTER_MAP_VERBOSE) { - LOGD("Expansion successful (%d -> %d)", + ALOGD("Expansion successful (%d -> %d)", computeRegisterMapSize(pMap), computeRegisterMapSize(pNewMap)); } diff --git a/vm/analysis/VfyBasicBlock.cpp b/vm/analysis/VfyBasicBlock.cpp index 77a21c648..46316fe97 100644 --- a/vm/analysis/VfyBasicBlock.cpp +++ b/vm/analysis/VfyBasicBlock.cpp @@ -382,7 +382,7 @@ bool dvmComputeVfyBasicBlocks(VerifierData* vdata) if (numHandlers <= kHandlerStackAllocSize) { handlerList = handlerAddrs; } else { - LOGD("overflow, numHandlers=%d", numHandlers); + ALOGD("overflow, numHandlers=%d", numHandlers); handlerListAlloc = (u4*) malloc(sizeof(u4) * numHandlers); if (handlerListAlloc == NULL) return false; diff --git a/vm/compiler/Compiler.cpp b/vm/compiler/Compiler.cpp index c08d42dfb..6e3402116 100644 --- a/vm/compiler/Compiler.cpp +++ b/vm/compiler/Compiler.cpp @@ -185,7 +185,7 @@ bool dvmCompilerSetupCodeCache(void) gDvmJit.pageSizeMask = getpagesize() - 1; /* This can be found through "dalvik-jit-code-cache" in /proc/<pid>/maps */ - // LOGD("Code cache starts at %p", gDvmJit.codeCache); + // ALOGD("Code cache starts at %p", gDvmJit.codeCache); /* Copy the template code into the beginning of the code cache */ int templateSize = (intptr_t) dmvCompilerTemplateEnd - @@ -227,7 +227,7 @@ static void crawlDalvikStack(Thread *thread, bool print) int stackLevel = 0; if (print) { - LOGD("Crawling tid %d (%s / %p %s)", thread->systemTid, + ALOGD("Crawling tid %d (%s / %p %s)", thread->systemTid, dvmGetThreadStatusStr(thread->status), thread->inJitCodeCache, thread->inJitCodeCache ? "jit" : "interp"); @@ -238,11 +238,11 @@ static void crawlDalvikStack(Thread *thread, bool print) if (print) { if (dvmIsBreakFrame((u4*)fp)) { - LOGD(" #%d: break frame (%p)", + ALOGD(" #%d: break frame (%p)", stackLevel, saveArea->returnAddr); } else { - LOGD(" #%d: %s.%s%s (%p)", + ALOGD(" #%d: %s.%s%s (%p)", stackLevel, saveArea->method->clazz->descriptor, saveArea->method->name, @@ -287,7 +287,7 @@ static void resetCodeCache(void) dvmUnlockThreadList(); if (inJit) { - LOGD("JIT code cache reset delayed (%d bytes %d/%d)", + ALOGD("JIT code cache reset delayed (%d bytes %d/%d)", gDvmJit.codeCacheByteUsed, gDvmJit.numCodeCacheReset, ++gDvmJit.numCodeCacheResetDelayed); return; @@ -348,7 +348,7 @@ static void resetCodeCache(void) dvmUnlockMutex(&gDvmJit.compilerLock); - LOGD("JIT code cache reset in %lld ms (%d bytes %d/%d)", + ALOGD("JIT code cache reset in %lld ms (%d bytes %d/%d)", (dvmGetRelativeTimeUsec() - startTime) / 1000, byteUsed, ++gDvmJit.numCodeCacheReset, gDvmJit.numCodeCacheResetDelayed); @@ -612,7 +612,7 @@ static void *compilerThreadStart(void *arg) pthread_cond_wait(&gDvmJit.compilerQueueActivity, &gDvmJit.compilerLock); dvmUnlockMutex(&gDvmJit.compilerLock); - LOGD("JIT started for system_server"); + ALOGD("JIT started for system_server"); } else { dvmLockMutex(&gDvmJit.compilerLock); /* @@ -680,7 +680,7 @@ static void *compilerThreadStart(void *arg) gDvmJit.codeCacheFull |= resizeFail; } if (gDvmJit.haltCompilerThread) { - LOGD("Compiler shutdown in progress - discarding request"); + ALOGD("Compiler shutdown in progress - discarding request"); } else if (!gDvmJit.codeCacheFull) { jmp_buf jmpBuf; work.bailPtr = &jmpBuf; @@ -726,7 +726,7 @@ static void *compilerThreadStart(void *arg) dvmChangeStatus(NULL, THREAD_RUNNING); if (gDvm.verboseShutdown) - LOGD("Compiler thread shutting down"); + ALOGD("Compiler thread shutting down"); return NULL; } @@ -781,7 +781,7 @@ void dvmCompilerShutdown(void) if (pthread_join(gDvmJit.compilerHandle, &threadReturn) != 0) LOGW("Compiler thread join failed"); else if (gDvm.verboseShutdown) - LOGD("Compiler thread has shut down"); + ALOGD("Compiler thread has shut down"); } /* Break loops within the translation cache */ diff --git a/vm/compiler/Frontend.cpp b/vm/compiler/Frontend.cpp index 24ec6c7f6..735311883 100644 --- a/vm/compiler/Frontend.cpp +++ b/vm/compiler/Frontend.cpp @@ -49,7 +49,7 @@ static inline int parseInsn(const u2 *codePtr, DecodedInstruction *decInsn, dexDecodeInstruction(codePtr, decInsn); if (printMe) { char *decodedString = dvmCompilerGetDalvikDisassembly(decInsn, NULL); - LOGD("%p: %#06x %s", codePtr, opcode, decodedString); + ALOGD("%p: %#06x %s", codePtr, opcode, decodedString); } return dexGetWidthFromOpcode(opcode); } @@ -403,7 +403,7 @@ static bool filterMethodByCallGraph(Thread *thread, const char *curMethodName) (HashCompareFunc) strcmp, false) != NULL; if (found) { - LOGD("Method %s (--> %s) found on the JIT %s list", + ALOGD("Method %s (--> %s) found on the JIT %s list", method->name, curMethodName, gDvmJit.includeSelectedMethod ? "white" : "black"); return true; @@ -1321,7 +1321,7 @@ bool dvmCompileMethod(const Method *method, JitTranslationInfo *info) dvmCompilerAssembleLIR(&cUnit, info); cUnit.assemblerRetries++; if (cUnit.printMe && cUnit.assemblerStatus != kSuccess) - LOGD("Assembler abort #%d on %d",cUnit.assemblerRetries, + ALOGD("Assembler abort #%d on %d",cUnit.assemblerRetries, cUnit.assemblerStatus); } while (cUnit.assemblerStatus == kRetryAll); @@ -1534,7 +1534,7 @@ static bool compileLoop(CompilationUnit *cUnit, unsigned int startOffset, /* Loop contains never executed blocks / heavy instructions */ if (cUnit->quitLoopMode) { if (cUnit->printMe || gDvmJit.receivedSIGUSR2) { - LOGD("Loop trace @ offset %04x aborted due to unresolved code info", + ALOGD("Loop trace @ offset %04x aborted due to unresolved code info", cUnit->entryBlock->startOffset); } goto bail; @@ -1545,7 +1545,7 @@ static bool compileLoop(CompilationUnit *cUnit, unsigned int startOffset, dvmCompilerAssembleLIR(cUnit, info); cUnit->assemblerRetries++; if (cUnit->printMe && cUnit->assemblerStatus != kSuccess) - LOGD("Assembler abort #%d on %d", cUnit->assemblerRetries, + ALOGD("Assembler abort #%d on %d", cUnit->assemblerRetries, cUnit->assemblerStatus); } while (cUnit->assemblerStatus == kRetryAll); @@ -1555,7 +1555,7 @@ static bool compileLoop(CompilationUnit *cUnit, unsigned int startOffset, } if (cUnit->printMe || gDvmJit.receivedSIGUSR2) { - LOGD("Loop trace @ offset %04x", cUnit->entryBlock->startOffset); + ALOGD("Loop trace @ offset %04x", cUnit->entryBlock->startOffset); dvmCompilerCodegenDump(cUnit); } @@ -1745,7 +1745,7 @@ bool dvmCompileTrace(JitTraceDescription *desc, int numMaxInsts, curBB = entryCodeBB; if (cUnit.printMe) { - LOGD("--------\nCompiler: Building trace for %s, offset %#x", + ALOGD("--------\nCompiler: Building trace for %s, offset %#x", desc->method->name, curOffset); } @@ -2013,7 +2013,7 @@ bool dvmCompileTrace(JitTraceDescription *desc, int numMaxInsts, if (cUnit.printMe) { char* signature = dexProtoCopyMethodDescriptor(&desc->method->prototype); - LOGD("TRACEINFO (%d): 0x%08x %s%s.%s %#x %d of %d, %d blocks", + ALOGD("TRACEINFO (%d): 0x%08x %s%s.%s %#x %d of %d, %d blocks", compilationId, (intptr_t) desc->method->insns, desc->method->clazz->descriptor, @@ -2060,14 +2060,14 @@ bool dvmCompileTrace(JitTraceDescription *desc, int numMaxInsts, dvmCompilerAssembleLIR(&cUnit, info); cUnit.assemblerRetries++; if (cUnit.printMe && cUnit.assemblerStatus != kSuccess) - LOGD("Assembler abort #%d on %d",cUnit.assemblerRetries, + ALOGD("Assembler abort #%d on %d",cUnit.assemblerRetries, cUnit.assemblerStatus); } while (cUnit.assemblerStatus == kRetryAll); if (cUnit.printMe) { - LOGD("Trace Dalvik PC: %p", startCodePtr); + ALOGD("Trace Dalvik PC: %p", startCodePtr); dvmCompilerCodegenDump(&cUnit); - LOGD("End %s%s, %d Dalvik instructions", + ALOGD("End %s%s, %d Dalvik instructions", desc->method->clazz->descriptor, desc->method->name, cUnit.numInsts); } diff --git a/vm/compiler/Utility.cpp b/vm/compiler/Utility.cpp index b69faba89..b2bff8108 100644 --- a/vm/compiler/Utility.cpp +++ b/vm/compiler/Utility.cpp @@ -172,10 +172,10 @@ void dvmCompilerDumpCompilationUnit(CompilationUnit *cUnit) "Exception Handling", }; - LOGD("Compiling %s %s", cUnit->method->clazz->descriptor, + ALOGD("Compiling %s %s", cUnit->method->clazz->descriptor, cUnit->method->name); - LOGD("%d insns", dvmGetMethodInsnsSize(cUnit->method)); - LOGD("%d blocks in total", cUnit->numBlocks); + ALOGD("%d insns", dvmGetMethodInsnsSize(cUnit->method)); + ALOGD("%d blocks in total", cUnit->numBlocks); GrowableListIterator iterator; dvmGrowableListIteratorInit(&cUnit->blockList, &iterator); @@ -183,18 +183,18 @@ void dvmCompilerDumpCompilationUnit(CompilationUnit *cUnit) while (true) { bb = (BasicBlock *) dvmGrowableListIteratorNext(&iterator); if (bb == NULL) break; - LOGD("Block %d (%s) (insn %04x - %04x%s)", + ALOGD("Block %d (%s) (insn %04x - %04x%s)", bb->id, blockTypeNames[bb->blockType], bb->startOffset, bb->lastMIRInsn ? bb->lastMIRInsn->offset : bb->startOffset, bb->lastMIRInsn ? "" : " empty"); if (bb->taken) { - LOGD(" Taken branch: block %d (%04x)", + ALOGD(" Taken branch: block %d (%04x)", bb->taken->id, bb->taken->startOffset); } if (bb->fallThrough) { - LOGD(" Fallthrough : block %d (%04x)", + ALOGD(" Fallthrough : block %d (%04x)", bb->fallThrough->id, bb->fallThrough->startOffset); } } @@ -220,7 +220,7 @@ static int dumpMethodStats(void *compilerMethodStats, void *totalMethodStats) /* If over 3/4 of the Dalvik code is compiled, print something */ if (methodStats->compiledDalvikSize >= limit) { - LOGD("Method stats: %s%s, %d/%d (compiled/total Dalvik), %d (native)", + ALOGD("Method stats: %s%s, %d/%d (compiled/total Dalvik), %d (native)", methodStats->method->clazz->descriptor, methodStats->method->name, methodStats->compiledDalvikSize, @@ -240,20 +240,20 @@ void dvmCompilerDumpStats(void) CompilerMethodStats totalMethodStats; memset(&totalMethodStats, 0, sizeof(CompilerMethodStats)); - LOGD("%d compilations using %d + %d bytes", + ALOGD("%d compilations using %d + %d bytes", gDvmJit.numCompilations, gDvmJit.templateSize, gDvmJit.codeCacheByteUsed - gDvmJit.templateSize); - LOGD("Compiler arena uses %d blocks (%d bytes each)", + ALOGD("Compiler arena uses %d blocks (%d bytes each)", numArenaBlocks, ARENA_DEFAULT_SIZE); - LOGD("Compiler work queue length is %d/%d", gDvmJit.compilerQueueLength, + ALOGD("Compiler work queue length is %d/%d", gDvmJit.compilerQueueLength, gDvmJit.compilerMaxQueued); dvmJitStats(); dvmCompilerArchDump(); if (gDvmJit.methodStatsTable) { dvmHashForeach(gDvmJit.methodStatsTable, dumpMethodStats, &totalMethodStats); - LOGD("Code size stats: %d/%d (compiled/total Dalvik), %d (native)", + ALOGD("Code size stats: %d/%d (compiled/total Dalvik), %d (native)", totalMethodStats.compiledDalvikSize, totalMethodStats.dalvikSize, totalMethodStats.nativeSize); diff --git a/vm/compiler/codegen/arm/ArchUtility.cpp b/vm/compiler/codegen/arm/ArchUtility.cpp index 0bbb87588..e6075e833 100644 --- a/vm/compiler/codegen/arm/ArchUtility.cpp +++ b/vm/compiler/codegen/arm/ArchUtility.cpp @@ -281,7 +281,7 @@ void dvmDumpResourceMask(LIR *lir, u8 mask, const char *prefix) } } if (buf[0]) { - LOGD("%s: %s", prefix, buf); + ALOGD("%s: %s", prefix, buf); } } @@ -304,69 +304,69 @@ void dvmDumpLIRInsn(LIR *arg, unsigned char *baseAddr) /* Handle pseudo-ops individually, and all regular insns as a group */ switch(lir->opcode) { case kArmChainingCellBottom: - LOGD("-------- end of chaining cells (0x%04x)", offset); + ALOGD("-------- end of chaining cells (0x%04x)", offset); break; case kArmPseudoBarrier: - LOGD("-------- BARRIER"); + ALOGD("-------- BARRIER"); break; case kArmPseudoExtended: - LOGD("-------- %s", (char *) dest); + ALOGD("-------- %s", (char *) dest); break; case kArmPseudoSSARep: DUMP_SSA_REP(LOGD("-------- %s", (char *) dest)); break; case kArmPseudoChainingCellBackwardBranch: - LOGD("L%p:", lir); - LOGD("-------- chaining cell (backward branch): 0x%04x", dest); + ALOGD("L%p:", lir); + ALOGD("-------- chaining cell (backward branch): 0x%04x", dest); break; case kArmPseudoChainingCellNormal: - LOGD("L%p:", lir); - LOGD("-------- chaining cell (normal): 0x%04x", dest); + ALOGD("L%p:", lir); + ALOGD("-------- chaining cell (normal): 0x%04x", dest); break; case kArmPseudoChainingCellHot: - LOGD("L%p:", lir); - LOGD("-------- chaining cell (hot): 0x%04x", dest); + ALOGD("L%p:", lir); + ALOGD("-------- chaining cell (hot): 0x%04x", dest); break; case kArmPseudoChainingCellInvokePredicted: - LOGD("L%p:", lir); - LOGD("-------- chaining cell (predicted): %s%s", + ALOGD("L%p:", lir); + ALOGD("-------- chaining cell (predicted): %s%s", dest ? ((Method *) dest)->clazz->descriptor : "", dest ? ((Method *) dest)->name : "N/A"); break; case kArmPseudoChainingCellInvokeSingleton: - LOGD("L%p:", lir); - LOGD("-------- chaining cell (invoke singleton): %s%s/%p", + ALOGD("L%p:", lir); + ALOGD("-------- chaining cell (invoke singleton): %s%s/%p", ((Method *)dest)->clazz->descriptor, ((Method *)dest)->name, ((Method *)dest)->insns); break; case kArmPseudoEntryBlock: - LOGD("-------- entry offset: 0x%04x", dest); + ALOGD("-------- entry offset: 0x%04x", dest); break; case kArmPseudoDalvikByteCodeBoundary: - LOGD("-------- dalvik offset: 0x%04x @ %s", dest, + ALOGD("-------- dalvik offset: 0x%04x @ %s", dest, (char *) lir->operands[1]); break; case kArmPseudoExitBlock: - LOGD("-------- exit offset: 0x%04x", dest); + ALOGD("-------- exit offset: 0x%04x", dest); break; case kArmPseudoPseudoAlign4: - LOGD("%p (%04x): .align4", baseAddr + offset, offset); + ALOGD("%p (%04x): .align4", baseAddr + offset, offset); break; case kArmPseudoPCReconstructionCell: - LOGD("L%p:", lir); - LOGD("-------- reconstruct dalvik PC : 0x%04x @ +0x%04x", dest, + ALOGD("L%p:", lir); + ALOGD("-------- reconstruct dalvik PC : 0x%04x @ +0x%04x", dest, lir->operands[1]); break; case kArmPseudoPCReconstructionBlockLabel: /* Do nothing */ break; case kArmPseudoEHBlockLabel: - LOGD("Exception_Handling:"); + ALOGD("Exception_Handling:"); break; case kArmPseudoTargetLabel: case kArmPseudoNormalBlockLabel: - LOGD("L%p:", lir); + ALOGD("L%p:", lir); break; default: if (lir->flags.isNop && !dumpNop) { @@ -376,7 +376,7 @@ void dvmDumpLIRInsn(LIR *arg, unsigned char *baseAddr) baseAddr, 256); buildInsnString(EncodingMap[lir->opcode].fmt, lir, buf, baseAddr, 256); - LOGD("%p (%04x): %-8s%s%s", + ALOGD("%p (%04x): %-8s%s%s", baseAddr + offset, offset, opName, buf, lir->flags.isNop ? "(nop)" : ""); break; @@ -395,25 +395,25 @@ void dvmDumpLIRInsn(LIR *arg, unsigned char *baseAddr) /* Dump instructions and constant pool contents */ void dvmCompilerCodegenDump(CompilationUnit *cUnit) { - LOGD("Dumping LIR insns"); + ALOGD("Dumping LIR insns"); LIR *lirInsn; ArmLIR *armLIR; - LOGD("installed code is at %p", cUnit->baseAddr); - LOGD("total size is %d bytes", cUnit->totalSize); + ALOGD("installed code is at %p", cUnit->baseAddr); + ALOGD("total size is %d bytes", cUnit->totalSize); for (lirInsn = cUnit->firstLIRInsn; lirInsn; lirInsn = lirInsn->next) { dvmDumpLIRInsn(lirInsn, (unsigned char *) cUnit->baseAddr); } for (lirInsn = cUnit->classPointerList; lirInsn; lirInsn = lirInsn->next) { armLIR = (ArmLIR *) lirInsn; - LOGD("%p (%04x): .class (%s)", + ALOGD("%p (%04x): .class (%s)", (char*)cUnit->baseAddr + armLIR->generic.offset, armLIR->generic.offset, ((CallsiteInfo *) armLIR->operands[0])->classDescriptor); } for (lirInsn = cUnit->literalList; lirInsn; lirInsn = lirInsn->next) { armLIR = (ArmLIR *) lirInsn; - LOGD("%p (%04x): .word (%#x)", + ALOGD("%p (%04x): .word (%#x)", (char*)cUnit->baseAddr + armLIR->generic.offset, armLIR->generic.offset, armLIR->operands[0]); diff --git a/vm/compiler/codegen/arm/Assemble.cpp b/vm/compiler/codegen/arm/Assemble.cpp index 312e7c1c0..09d2bc18b 100644 --- a/vm/compiler/codegen/arm/Assemble.cpp +++ b/vm/compiler/codegen/arm/Assemble.cpp @@ -963,14 +963,14 @@ static AssemblerStatus assembleInstructions(CompilationUnit *cUnit, } if ((lir->opcode == kThumb2LdrPcRel12) && (delta > 4091)) { if (cUnit->printMe) { - LOGD("kThumb2LdrPcRel12@%x: delta=%d", lir->generic.offset, + ALOGD("kThumb2LdrPcRel12@%x: delta=%d", lir->generic.offset, delta); dvmCompilerCodegenDump(cUnit); } return kRetryHalve; } else if (delta > 1020) { if (cUnit->printMe) { - LOGD("kThumbLdrPcRel@%x: delta=%d", lir->generic.offset, + ALOGD("kThumbLdrPcRel@%x: delta=%d", lir->generic.offset, delta); dvmCompilerCodegenDump(cUnit); } @@ -1006,7 +1006,7 @@ static AssemblerStatus assembleInstructions(CompilationUnit *cUnit, lir->generic.target = 0; dvmCompilerSetupResourceMasks(lir); if (cUnit->printMe) { - LOGD("kThumb2Cbnz/kThumb2Cbz@%x: delta=%d", + ALOGD("kThumb2Cbnz/kThumb2Cbz@%x: delta=%d", lir->generic.offset, delta); dvmCompilerCodegenDump(cUnit); } @@ -1022,7 +1022,7 @@ static AssemblerStatus assembleInstructions(CompilationUnit *cUnit, int delta = target - pc; if ((lir->opcode == kThumbBCond) && (delta > 254 || delta < -256)) { if (cUnit->printMe) { - LOGD("kThumbBCond@%x: delta=%d", lir->generic.offset, + ALOGD("kThumbBCond@%x: delta=%d", lir->generic.offset, delta); dvmCompilerCodegenDump(cUnit); } @@ -1335,7 +1335,7 @@ static void matchSignatureBreakpoint(const CompilationUnit *cUnit, } } if (j == gDvmJit.signatureBreakpointSize) { - LOGD("Signature match starting from offset %#x (%d words)", + ALOGD("Signature match starting from offset %#x (%d words)", i*4, gDvmJit.signatureBreakpointSize); int descSize = getTraceDescriptionSize(cUnit->traceDesc); JitTraceDescription *newCopy = @@ -1604,7 +1604,7 @@ void* dvmJitChain(void* tgtAddr, u4* branchAddr) gDvmJit.translationChains++; COMPILER_TRACE_CHAINING( - LOGD("Jit Runtime: chaining %#x to %#x", + ALOGD("Jit Runtime: chaining %#x to %#x", (int) branchAddr, (int) tgtAddr & -2)); /* @@ -1783,7 +1783,7 @@ const Method *dvmJitToPatchPredictedChain(const Method *method, if ((tgtAddr == 0) || ((void*)tgtAddr == dvmCompilerGetInterpretTemplate())) { COMPILER_TRACE_CHAINING( - LOGD("Jit Runtime: predicted chain %p to method %s%s delayed", + ALOGD("Jit Runtime: predicted chain %p to method %s%s delayed", cell, method->clazz->descriptor, method->name)); goto done; } @@ -1835,7 +1835,7 @@ void dvmCompilerPatchInlineCache(void) UNPROTECT_CODE_CACHE(gDvmJit.codeCache, gDvmJit.codeCacheByteUsed); - //LOGD("Number of IC patch work orders: %d", gDvmJit.compilerICPatchIndex); + //ALOGD("Number of IC patch work orders: %d", gDvmJit.compilerICPatchIndex); /* Initialize the min/max address range */ minAddr = (PredictedChainingCell *) @@ -1855,7 +1855,7 @@ void dvmCompilerPatchInlineCache(void) cellContent->clazz = clazz; COMPILER_TRACE_CHAINING( - LOGD("Jit Runtime: predicted chain %p from %s to %s (%s) " + ALOGD("Jit Runtime: predicted chain %p from %s to %s (%s) " "patched", cellAddr, cellAddr->clazz->descriptor, @@ -1943,7 +1943,7 @@ static u4* unchainSingle(JitEntry *trace) dvmAbort(); // dvmAbort OK here - can't safely recover } COMPILER_TRACE_CHAINING( - LOGD("Jit Runtime: unchaining %#x", (int)pChainCells)); + ALOGD("Jit Runtime: unchaining %#x", (int)pChainCells)); pChainCells += elemSize; /* Advance by a fixed number of words */ } } @@ -2015,12 +2015,12 @@ static int dumpTraceProfile(JitEntry *p, bool silent, bool reset, if (p->codeAddress == NULL) { if (!silent) - LOGD("TRACEPROFILE NULL"); + ALOGD("TRACEPROFILE NULL"); return 0; } if (p->codeAddress == dvmCompilerGetInterpretTemplate()) { if (!silent) - LOGD("TRACEPROFILE INTERPRET_ONLY"); + ALOGD("TRACEPROFILE INTERPRET_ONLY"); return 0; } JitTraceCounter_t count = getProfileCount(p); @@ -2049,7 +2049,7 @@ static int dumpTraceProfile(JitEntry *p, bool silent, bool reset, method->accessFlags, addrToLineCb, NULL, &addrToLine); - LOGD("TRACEPROFILE 0x%08x % 10d %5.2f%% [%#x(+%d), %d] %s%s;%s", + ALOGD("TRACEPROFILE 0x%08x % 10d %5.2f%% [%#x(+%d), %d] %s%s;%s", (int) getTraceBase(p), count, ((float ) count) / sum * 100.0, @@ -2074,7 +2074,7 @@ static int dumpTraceProfile(JitEntry *p, bool silent, bool reset, desc->trace[idx+JIT_TRACE_CUR_METHOD-1].info.meta; char *methodDesc = dexProtoCopyMethodDescriptor(&method->prototype); /* Print the callee info in the trace */ - LOGD(" -> %s%s;%s", method->clazz->descriptor, method->name, + ALOGD(" -> %s%s;%s", method->clazz->descriptor, method->name, methodDesc); } @@ -2147,7 +2147,7 @@ void dvmCompilerSortAndPrintTraceProfiles() sum = 1; } - LOGD("JIT: Average execution count -> %d",(int)(sum / numTraces)); + ALOGD("JIT: Average execution count -> %d",(int)(sum / numTraces)); /* Dump the sorted entries. The count of each trace will be reset to 0. */ for (i=0; i < gDvmJit.jitTableSize; i++) { @@ -2423,7 +2423,7 @@ static int selfVerificationLoad(int addr, int size) dvmAbort(); } - //LOGD("*** HEAP LOAD: Addr: %#x Data: %#x Size: %d", addr, data, size); + //ALOGD("*** HEAP LOAD: Addr: %#x Data: %#x Size: %d", addr, data, size); return data; } @@ -2447,7 +2447,7 @@ static s8 selfVerificationLoadDoubleword(int addr) } } - //LOGD("*** HEAP LOAD DOUBLEWORD: Addr: %#x Data: %#x Data2: %#x", + //ALOGD("*** HEAP LOAD DOUBLEWORD: Addr: %#x Data: %#x Data2: %#x", // addr, data, data2); return (((s8) data2) << 32) | data; } @@ -2467,7 +2467,7 @@ static void selfVerificationStore(int addr, int data, int size) int maskedAddr = addr & 0xFFFFFFFC; int alignment = addr & 0x3; - //LOGD("*** HEAP STORE: Addr: %#x Data: %#x Size: %d", addr, data, size); + //ALOGD("*** HEAP STORE: Addr: %#x Data: %#x Size: %d", addr, data, size); for (heapSpacePtr = shadowSpace->heapSpace; heapSpacePtr != shadowSpace->heapSpaceTail; heapSpacePtr++) { @@ -2515,7 +2515,7 @@ static void selfVerificationStoreDoubleword(int addr, s8 double_data) int data2 = double_data >> 32; bool store1 = false, store2 = false; - //LOGD("*** HEAP STORE DOUBLEWORD: Addr: %#x Data: %#x, Data2: %#x", + //ALOGD("*** HEAP STORE DOUBLEWORD: Addr: %#x Data: %#x, Data2: %#x", // addr, data, data2); for (heapSpacePtr = shadowSpace->heapSpace; @@ -2628,7 +2628,7 @@ void dvmSelfVerificationMemOpDecode(int lr, int* sp) if ((insn & kMemOp2) == kMemOp2) { insn = (insn << 16) | (insn >> 16); - //LOGD("*** THUMB2 - Addr: %#x Insn: %#x", lr, insn); + //ALOGD("*** THUMB2 - Addr: %#x Insn: %#x", lr, insn); int opcode12 = (insn >> 20) & 0xFFF; int opcode4 = (insn >> 8) & 0xF; @@ -2753,7 +2753,7 @@ void dvmSelfVerificationMemOpDecode(int lr, int* sp) // Handle the decoded mem op accordingly if (store) { if (size == kSVVariable) { - LOGD("*** THUMB2 STMIA CURRENTLY UNUSED (AND UNTESTED)"); + ALOGD("*** THUMB2 STMIA CURRENTLY UNUSED (AND UNTESTED)"); int i; int regList = insn & 0xFFFF; for (i = 0; i < 16; i++) { @@ -2774,7 +2774,7 @@ void dvmSelfVerificationMemOpDecode(int lr, int* sp) } } else { if (size == kSVVariable) { - LOGD("*** THUMB2 LDMIA CURRENTLY UNUSED (AND UNTESTED)"); + ALOGD("*** THUMB2 LDMIA CURRENTLY UNUSED (AND UNTESTED)"); int i; int regList = insn & 0xFFFF; for (i = 0; i < 16; i++) { @@ -2795,7 +2795,7 @@ void dvmSelfVerificationMemOpDecode(int lr, int* sp) } } } else { - //LOGD("*** THUMB - Addr: %#x Insn: %#x", lr, insn); + //ALOGD("*** THUMB - Addr: %#x Insn: %#x", lr, insn); // Update the link register selfVerificationMemRegStore(sp, old_lr+2, 13); diff --git a/vm/compiler/codegen/arm/CodegenDriver.cpp b/vm/compiler/codegen/arm/CodegenDriver.cpp index 85ecb7892..ef0f0432a 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.cpp +++ b/vm/compiler/codegen/arm/CodegenDriver.cpp @@ -2548,7 +2548,7 @@ static bool handleFmt22c_Fmt52c(CompilationUnit *cUnit, MIR *mir) */ if (classPtr == NULL) { BAIL_LOOP_COMPILATION(); - LOGD("null clazz in OP_INSTANCE_OF, single-stepping"); + ALOGD("null clazz in OP_INSTANCE_OF, single-stepping"); genInterpSingleStep(cUnit, mir); break; } @@ -4758,7 +4758,7 @@ void dvmCompilerArchDump(void) } } if (strlen(buf)) { - LOGD("dalvik.vm.jit.op = %s", buf); + ALOGD("dalvik.vm.jit.op = %s", buf); } } diff --git a/vm/compiler/codegen/arm/LocalOptimizations.cpp b/vm/compiler/codegen/arm/LocalOptimizations.cpp index b89437e19..98848c775 100644 --- a/vm/compiler/codegen/arm/LocalOptimizations.cpp +++ b/vm/compiler/codegen/arm/LocalOptimizations.cpp @@ -45,7 +45,7 @@ static inline bool isDalvikRegisterClobbered(ArmLIR *lir1, ArmLIR *lir2) static void dumpDependentInsnPair(ArmLIR *thisLIR, ArmLIR *checkLIR, const char *optimization) { - LOGD("************ %s ************", optimization); + ALOGD("************ %s ************", optimization); dvmDumpLIRInsn((LIR *) thisLIR, 0); dvmDumpLIRInsn((LIR *) checkLIR, 0); } diff --git a/vm/compiler/codegen/x86/CodegenDriver.cpp b/vm/compiler/codegen/x86/CodegenDriver.cpp index a5ef56afb..789d4317e 100644 --- a/vm/compiler/codegen/x86/CodegenDriver.cpp +++ b/vm/compiler/codegen/x86/CodegenDriver.cpp @@ -287,7 +287,7 @@ void dvmCompilerArchDump(void) } } if (strlen(buf)) { - LOGD("dalvik.vm.jit.op = %s", buf); + ALOGD("dalvik.vm.jit.op = %s", buf); } } diff --git a/vm/interp/Interp.cpp b/vm/interp/Interp.cpp index 7951eff29..b0c055378 100644 --- a/vm/interp/Interp.cpp +++ b/vm/interp/Interp.cpp @@ -1564,26 +1564,26 @@ void dvmCheckInterpStateConsistency() handlerTable = self->interpBreak.ctl.curHandlerTable; for (thread = gDvm.threadList; thread != NULL; thread = thread->next) { if (subMode != thread->interpBreak.ctl.subMode) { - LOGD("Warning: subMode mismatch - %#x:%#x, tid[%d]", + ALOGD("Warning: subMode mismatch - %#x:%#x, tid[%d]", subMode,thread->interpBreak.ctl.subMode,thread->threadId); } if (breakFlags != thread->interpBreak.ctl.breakFlags) { - LOGD("Warning: breakFlags mismatch - %#x:%#x, tid[%d]", + ALOGD("Warning: breakFlags mismatch - %#x:%#x, tid[%d]", breakFlags,thread->interpBreak.ctl.breakFlags,thread->threadId); } if (handlerTable != thread->interpBreak.ctl.curHandlerTable) { - LOGD("Warning: curHandlerTable mismatch - %#x:%#x, tid[%d]", + ALOGD("Warning: curHandlerTable mismatch - %#x:%#x, tid[%d]", (int)handlerTable,(int)thread->interpBreak.ctl.curHandlerTable, thread->threadId); } #if defined(WITH_JIT) if (thread->pJitProfTable != gDvmJit.pProfTable) { - LOGD("Warning: pJitProfTable mismatch - %#x:%#x, tid[%d]", + ALOGD("Warning: pJitProfTable mismatch - %#x:%#x, tid[%d]", (int)thread->pJitProfTable,(int)gDvmJit.pProfTable, thread->threadId); } if (thread->jitThreshold != gDvmJit.threshold) { - LOGD("Warning: jitThreshold mismatch - %#x:%#x, tid[%d]", + ALOGD("Warning: jitThreshold mismatch - %#x:%#x, tid[%d]", (int)thread->jitThreshold,(int)gDvmJit.threshold, thread->threadId); } @@ -1818,13 +1818,13 @@ void dvmCheckBefore(const u2 *pc, u4 *fp, Thread* self) if (self->jitResumeDPC != NULL) { if (self->jitResumeDPC == pc) { if (self->jitResumeNPC != NULL) { - LOGD("SS return to trace - pc:%#x to 0x:%x", + ALOGD("SS return to trace - pc:%#x to 0x:%x", (int)pc, (int)self->jitResumeNPC); } else { - LOGD("SS return to interp - pc:%#x",(int)pc); + ALOGD("SS return to interp - pc:%#x",(int)pc); } } else { - LOGD("SS failed to return. Expected %#x, now at %#x", + ALOGD("SS failed to return. Expected %#x, now at %#x", (int)self->jitResumeDPC, (int)pc); } } diff --git a/vm/interp/Jit.cpp b/vm/interp/Jit.cpp index 494aae1a9..2a6bb653c 100644 --- a/vm/interp/Jit.cpp +++ b/vm/interp/Jit.cpp @@ -74,14 +74,14 @@ void* dvmSelfVerificationSaveState(const u2* pc, u4* fp, sizeof(StackSaveArea); unsigned postBytes = self->interpSave.method->registersSize*4; - //LOGD("### selfVerificationSaveState(%d) pc: %#x fp: %#x", + //ALOGD("### selfVerificationSaveState(%d) pc: %#x fp: %#x", // self->threadId, (int)pc, (int)fp); if (shadowSpace->selfVerificationState != kSVSIdle) { - LOGD("~~~ Save: INCORRECT PREVIOUS STATE(%d): %d", + ALOGD("~~~ Save: INCORRECT PREVIOUS STATE(%d): %d", self->threadId, shadowSpace->selfVerificationState); - LOGD("********** SHADOW STATE DUMP **********"); - LOGD("PC: %#x FP: %#x", (int)pc, (int)fp); + ALOGD("********** SHADOW STATE DUMP **********"); + ALOGD("PC: %#x FP: %#x", (int)pc, (int)fp); } shadowSpace->selfVerificationState = kSVSStart; @@ -138,18 +138,18 @@ void* dvmSelfVerificationRestoreState(const u2* pc, u4* fp, shadowSpace->endShadowFP = fp; shadowSpace->jitExitState = exitState; - //LOGD("### selfVerificationRestoreState(%d) pc: %#x fp: %#x endPC: %#x", + //ALOGD("### selfVerificationRestoreState(%d) pc: %#x fp: %#x endPC: %#x", // self->threadId, (int)shadowSpace->startPC, (int)shadowSpace->fp, // (int)pc); if (shadowSpace->selfVerificationState != kSVSStart) { - LOGD("~~~ Restore: INCORRECT PREVIOUS STATE(%d): %d", + ALOGD("~~~ Restore: INCORRECT PREVIOUS STATE(%d): %d", self->threadId, shadowSpace->selfVerificationState); - LOGD("********** SHADOW STATE DUMP **********"); - LOGD("Dalvik PC: %#x endPC: %#x", (int)shadowSpace->startPC, + ALOGD("********** SHADOW STATE DUMP **********"); + ALOGD("Dalvik PC: %#x endPC: %#x", (int)shadowSpace->startPC, (int)shadowSpace->endPC); - LOGD("Interp FP: %#x", (int)shadowSpace->fp); - LOGD("Shadow FP: %#x endFP: %#x", (int)shadowSpace->shadowFP, + ALOGD("Interp FP: %#x", (int)shadowSpace->fp); + ALOGD("Shadow FP: %#x endFP: %#x", (int)shadowSpace->shadowFP, (int)shadowSpace->endShadowFP); } @@ -177,7 +177,7 @@ static void selfVerificationPrintRegisters(int* addr, int* addrRef, { int i; for (i = 0; i < numWords; i++) { - LOGD("(v%d) 0x%8x%s", i, addr[i], addr[i] != addrRef[i] ? " X" : ""); + ALOGD("(v%d) 0x%8x%s", i, addr[i], addr[i] != addrRef[i] ? " X" : ""); } } @@ -197,20 +197,20 @@ static void selfVerificationDumpState(const u2* pc, Thread* self) frameBytes2 = (int) shadowSpace->fp - (int)self->interpSave.curFrame - localRegs; } - LOGD("********** SHADOW STATE DUMP **********"); - LOGD("CurrentPC: %#x, Offset: 0x%04x", (int)pc, + ALOGD("********** SHADOW STATE DUMP **********"); + ALOGD("CurrentPC: %#x, Offset: 0x%04x", (int)pc, (int)(pc - stackSave->method->insns)); - LOGD("Class: %s", shadowSpace->method->clazz->descriptor); - LOGD("Method: %s", shadowSpace->method->name); - LOGD("Dalvik PC: %#x endPC: %#x", (int)shadowSpace->startPC, + ALOGD("Class: %s", shadowSpace->method->clazz->descriptor); + ALOGD("Method: %s", shadowSpace->method->name); + ALOGD("Dalvik PC: %#x endPC: %#x", (int)shadowSpace->startPC, (int)shadowSpace->endPC); - LOGD("Interp FP: %#x endFP: %#x", (int)shadowSpace->fp, + ALOGD("Interp FP: %#x endFP: %#x", (int)shadowSpace->fp, (int)self->interpSave.curFrame); - LOGD("Shadow FP: %#x endFP: %#x", (int)shadowSpace->shadowFP, + ALOGD("Shadow FP: %#x endFP: %#x", (int)shadowSpace->shadowFP, (int)shadowSpace->endShadowFP); - LOGD("Frame1 Bytes: %d Frame2 Local: %d Bytes: %d", frameBytes, + ALOGD("Frame1 Bytes: %d Frame2 Local: %d Bytes: %d", frameBytes, localRegs, frameBytes2); - LOGD("Trace length: %d State: %d", shadowSpace->traceLength, + ALOGD("Trace length: %d State: %d", shadowSpace->traceLength, shadowSpace->selfVerificationState); } @@ -222,13 +222,13 @@ static void selfVerificationDumpTrace(const u2* pc, Thread* self) int i, addr, offset; DecodedInstruction *decInsn; - LOGD("********** SHADOW TRACE DUMP **********"); + ALOGD("********** SHADOW TRACE DUMP **********"); for (i = 0; i < shadowSpace->traceLength; i++) { addr = shadowSpace->trace[i].addr; offset = (int)((u2*)addr - stackSave->method->insns); decInsn = &(shadowSpace->trace[i].decInsn); /* Not properly decoding instruction, some registers may be garbage */ - LOGD("%#x: (0x%04x) %s", + ALOGD("%#x: (0x%04x) %s", addr, offset, dexGetOpcodeName(decInsn->opcode)); } } @@ -269,12 +269,12 @@ void dvmCheckSelfVerification(const u2* pc, Thread* self) DecodedInstruction decInsn; dexDecodeInstruction(pc, &decInsn); - //LOGD("### DbgIntp(%d): PC: %#x endPC: %#x state: %d len: %d %s", + //ALOGD("### DbgIntp(%d): PC: %#x endPC: %#x state: %d len: %d %s", // self->threadId, (int)pc, (int)shadowSpace->endPC, state, // shadowSpace->traceLength, dexGetOpcodeName(decInsn.opcode)); if (state == kSVSIdle || state == kSVSStart) { - LOGD("~~~ DbgIntrp: INCORRECT PREVIOUS STATE(%d): %d", + ALOGD("~~~ DbgIntrp: INCORRECT PREVIOUS STATE(%d): %d", self->threadId, state); selfVerificationDumpState(pc, self); selfVerificationDumpTrace(pc, self); @@ -308,15 +308,15 @@ void dvmCheckSelfVerification(const u2* pc, Thread* self) shadowSpace->selfVerificationState = kSVSDebugInterp; goto log_and_continue; } - LOGD("~~~ DbgIntp(%d): REGISTERS DIVERGENCE!", self->threadId); + ALOGD("~~~ DbgIntp(%d): REGISTERS DIVERGENCE!", self->threadId); selfVerificationDumpState(pc, self); selfVerificationDumpTrace(pc, self); - LOGD("*** Interp Registers: addr: %#x bytes: %d", + ALOGD("*** Interp Registers: addr: %#x bytes: %d", (int)shadowSpace->fp, frameBytes); selfVerificationPrintRegisters((int*)shadowSpace->fp, (int*)shadowSpace->shadowFP, frameBytes/4); - LOGD("*** Shadow Registers: addr: %#x bytes: %d", + ALOGD("*** Shadow Registers: addr: %#x bytes: %d", (int)shadowSpace->shadowFP, frameBytes); selfVerificationPrintRegisters((int*)shadowSpace->shadowFP, (int*)shadowSpace->fp, @@ -341,16 +341,16 @@ void dvmCheckSelfVerification(const u2* pc, Thread* self) shadowSpace->selfVerificationState = kSVSDebugInterp; goto log_and_continue; } - LOGD("~~~ DbgIntp(%d): REGISTERS (FRAME2) DIVERGENCE!", + ALOGD("~~~ DbgIntp(%d): REGISTERS (FRAME2) DIVERGENCE!", self->threadId); selfVerificationDumpState(pc, self); selfVerificationDumpTrace(pc, self); - LOGD("*** Interp Registers: addr: %#x l: %d bytes: %d", + ALOGD("*** Interp Registers: addr: %#x l: %d bytes: %d", (int)self->interpSave.curFrame, localRegs, frameBytes2); selfVerificationPrintRegisters((int*)self->interpSave.curFrame, (int*)shadowSpace->endShadowFP, (frameBytes2+localRegs)/4); - LOGD("*** Shadow Registers: addr: %#x l: %d bytes: %d", + ALOGD("*** Shadow Registers: addr: %#x l: %d bytes: %d", (int)shadowSpace->endShadowFP, localRegs, frameBytes2); selfVerificationPrintRegisters((int*)shadowSpace->endShadowFP, (int*)self->interpSave.curFrame, @@ -374,8 +374,8 @@ void dvmCheckSelfVerification(const u2* pc, Thread* self) shadowSpace->selfVerificationState = kSVSDebugInterp; goto log_and_continue; } - LOGD("~~~ DbgIntp(%d): MEMORY DIVERGENCE!", self->threadId); - LOGD("Addr: %#x Intrp Data: %#x Jit Data: %#x", + ALOGD("~~~ DbgIntp(%d): MEMORY DIVERGENCE!", self->threadId); + ALOGD("Addr: %#x Intrp Data: %#x Jit Data: %#x", heapSpacePtr->addr, memData, heapSpacePtr->data); selfVerificationDumpState(pc, self); selfVerificationDumpTrace(pc, self); @@ -409,8 +409,8 @@ void dvmCheckSelfVerification(const u2* pc, Thread* self) log_and_continue: /* If end not been reached, make sure max length not exceeded */ if (shadowSpace->traceLength >= JIT_MAX_TRACE_LEN) { - LOGD("~~~ DbgIntp(%d): CONTROL DIVERGENCE!", self->threadId); - LOGD("startPC: %#x endPC: %#x currPC: %#x", + ALOGD("~~~ DbgIntp(%d): CONTROL DIVERGENCE!", self->threadId); + ALOGD("startPC: %#x endPC: %#x currPC: %#x", (int)shadowSpace->startPC, (int)shadowSpace->endPC, (int)pc); selfVerificationDumpState(pc, self); selfVerificationDumpTrace(pc, self); @@ -487,44 +487,44 @@ void dvmJitStats() if (gDvmJit.pJitEntryTable[i].u.info.chain != gDvmJit.jitTableSize) chains++; } - LOGD("JIT: table size is %d, entries used is %d", + ALOGD("JIT: table size is %d, entries used is %d", gDvmJit.jitTableSize, gDvmJit.jitTableEntriesUsed); - LOGD("JIT: %d traces, %d slots, %d chains, %d thresh, %s", + ALOGD("JIT: %d traces, %d slots, %d chains, %d thresh, %s", hit, not_hit + hit, chains, gDvmJit.threshold, gDvmJit.blockingMode ? "Blocking" : "Non-blocking"); #if defined(WITH_JIT_TUNING) - LOGD("JIT: Code cache patches: %d", gDvmJit.codeCachePatches); + ALOGD("JIT: Code cache patches: %d", gDvmJit.codeCachePatches); - LOGD("JIT: Lookups: %d hits, %d misses; %d normal, %d punt", + ALOGD("JIT: Lookups: %d hits, %d misses; %d normal, %d punt", gDvmJit.addrLookupsFound, gDvmJit.addrLookupsNotFound, gDvmJit.normalExit, gDvmJit.puntExit); - LOGD("JIT: ICHits: %d", gDvmICHitCount); + ALOGD("JIT: ICHits: %d", gDvmICHitCount); - LOGD("JIT: noChainExit: %d IC miss, %d interp callsite, " + ALOGD("JIT: noChainExit: %d IC miss, %d interp callsite, " "%d switch overflow", gDvmJit.noChainExit[kInlineCacheMiss], gDvmJit.noChainExit[kCallsiteInterpreted], gDvmJit.noChainExit[kSwitchOverflow]); - LOGD("JIT: ICPatch: %d init, %d rejected, %d lock-free, %d queued, " + ALOGD("JIT: ICPatch: %d init, %d rejected, %d lock-free, %d queued, " "%d dropped", gDvmJit.icPatchInit, gDvmJit.icPatchRejected, gDvmJit.icPatchLockFree, gDvmJit.icPatchQueued, gDvmJit.icPatchDropped); - LOGD("JIT: Invoke: %d mono, %d poly, %d native, %d return", + ALOGD("JIT: Invoke: %d mono, %d poly, %d native, %d return", gDvmJit.invokeMonomorphic, gDvmJit.invokePolymorphic, gDvmJit.invokeNative, gDvmJit.returnOp); - LOGD("JIT: Inline: %d mgetter, %d msetter, %d pgetter, %d psetter", + ALOGD("JIT: Inline: %d mgetter, %d msetter, %d pgetter, %d psetter", gDvmJit.invokeMonoGetterInlined, gDvmJit.invokeMonoSetterInlined, gDvmJit.invokePolyGetterInlined, gDvmJit.invokePolySetterInlined); - LOGD("JIT: Total compilation time: %llu ms", gDvmJit.jitTime / 1000); - LOGD("JIT: Avg unit compilation time: %llu us", + ALOGD("JIT: Total compilation time: %llu ms", gDvmJit.jitTime / 1000); + ALOGD("JIT: Avg unit compilation time: %llu us", gDvmJit.numCompilations == 0 ? 0 : gDvmJit.jitTime / gDvmJit.numCompilations); - LOGD("JIT: Potential GC blocked by compiler: max %llu us / " + ALOGD("JIT: Potential GC blocked by compiler: max %llu us / " "avg %llu us (%d)", gDvmJit.maxCompilerThreadBlockGCTime, gDvmJit.numCompilerThreadBlockGC == 0 ? @@ -533,7 +533,7 @@ void dvmJitStats() gDvmJit.numCompilerThreadBlockGC); #endif - LOGD("JIT: %d Translation chains, %d interp stubs", + ALOGD("JIT: %d Translation chains, %d interp stubs", gDvmJit.translationChains, stubs); if (gDvmJit.profileMode == kTraceProfilingContinuous) { dvmCompilerSortAndPrintTraceProfiles(); @@ -663,14 +663,14 @@ void dvmJitDumpTraceDesc(JitTraceDescription *trace) const u2* dpc; const u2* dpcBase; int curFrag = 0; - LOGD("==========================================="); - LOGD("Trace dump %#x, Method %s off %#x",(int)trace, + ALOGD("==========================================="); + ALOGD("Trace dump %#x, Method %s off %#x",(int)trace, trace->method->name,trace->trace[curFrag].info.frag.startOffset); dpcBase = trace->method->insns; while (!done) { DecodedInstruction decInsn; if (trace->trace[curFrag].isCode) { - LOGD("Frag[%d]- Insts: %d, start: %#x, hint: %#x, end: %d", + ALOGD("Frag[%d]- Insts: %d, start: %#x, hint: %#x, end: %d", curFrag, trace->trace[curFrag].info.frag.numInsts, trace->trace[curFrag].info.frag.startOffset, trace->trace[curFrag].info.frag.hint, @@ -678,7 +678,7 @@ void dvmJitDumpTraceDesc(JitTraceDescription *trace) dpc = dpcBase + trace->trace[curFrag].info.frag.startOffset; for (i=0; i<trace->trace[curFrag].info.frag.numInsts; i++) { dexDecodeInstruction(dpc, &decInsn); - LOGD(" 0x%04x - %s %#x",(dpc-dpcBase), + ALOGD(" 0x%04x - %s %#x",(dpc-dpcBase), dexGetOpcodeName(decInsn.opcode),(int)dpc); dpc += dexGetWidthFromOpcode(decInsn.opcode); } @@ -686,12 +686,12 @@ void dvmJitDumpTraceDesc(JitTraceDescription *trace) done = true; } } else { - LOGD("Frag[%d]- META info: 0x%08x", curFrag, + ALOGD("Frag[%d]- META info: 0x%08x", curFrag, (int)trace->trace[curFrag].info.meta); } curFrag++; } - LOGD("-------------------------------------------"); + ALOGD("-------------------------------------------"); } /* @@ -810,7 +810,7 @@ void dvmCheckJit(const u2* pc, Thread* self) } #if defined(SHOW_TRACE) - LOGD("TraceGen: adding %s. lpc:%#x, pc:%#x", + ALOGD("TraceGen: adding %s. lpc:%#x, pc:%#x", dexGetOpcodeName(decInsn.opcode), (int)lastPC, (int)pc); #endif flags = dexGetFlagsFromOpcode(decInsn.opcode); @@ -855,7 +855,7 @@ void dvmCheckJit(const u2* pc, Thread* self) kInstrInvoke)) != 0)) { self->jitState = kJitTSelectEnd; #if defined(SHOW_TRACE) - LOGD("TraceGen: ending on %s, basic block end", + ALOGD("TraceGen: ending on %s, basic block end", dexGetOpcodeName(decInsn.opcode)); #endif @@ -938,7 +938,7 @@ void dvmCheckJit(const u2* pc, Thread* self) (char*)&(self->trace[0]), sizeof(JitTraceRun) * (self->currTraceRun+1)); #if defined(SHOW_TRACE) - LOGD("TraceGen: trace done, adding to queue"); + ALOGD("TraceGen: trace done, adding to queue"); dvmJitDumpTraceDesc(desc); #endif if (dvmCompilerWorkEnqueue( @@ -1251,7 +1251,7 @@ void dvmJitCheckTraceRequest(Thread* self) * are afoot and disable profiling. */ self->jitState = kJitDone; - LOGD("JIT: JitTable full, disabling profiling"); + ALOGD("JIT: JitTable full, disabling profiling"); dvmJitStopTranslationRequests(); } } @@ -1277,7 +1277,7 @@ void dvmJitCheckTraceRequest(Thread* self) /* Turn on trace selection mode */ dvmEnableSubMode(self, kSubModeJitTraceBuild); #if defined(SHOW_TRACE) - LOGD("Starting trace for %s at %#x", + ALOGD("Starting trace for %s at %#x", self->interpSave.method->name, (int)self->interpSave.pc); #endif break; @@ -1318,7 +1318,7 @@ bool dvmJitResizeJitTable( unsigned int size ) /* Make sure requested size is compatible with chain field width */ tempEntry.u.info.chain = size; if (tempEntry.u.info.chain != size) { - LOGD("Jit: JitTable request of %d too big", size); + ALOGD("Jit: JitTable request of %d too big", size); return true; } diff --git a/vm/interp/Stack.cpp b/vm/interp/Stack.cpp index f482980fd..6c8a517f5 100644 --- a/vm/interp/Stack.cpp +++ b/vm/interp/Stack.cpp @@ -455,7 +455,7 @@ void dvmCallMethodV(Thread* self, const Method* method, Object* obj, ins = ((u4*)self->interpSave.curFrame) + (method->registersSize - method->insSize); - //LOGD(" FP is %p, INs live at >= %p", self->interpSave.curFrame, ins); + //ALOGD(" FP is %p, INs live at >= %p", self->interpSave.curFrame, ins); /* put "this" pointer into in0 if appropriate */ if (!dvmIsStaticMethod(method)) { @@ -687,7 +687,7 @@ Object* dvmInvokeMethod(Object* obj, const Method* method, (method->registersSize - method->insSize); verifyCount = 0; - //LOGD(" FP is %p, INs live at >= %p", self->interpSave.curFrame, ins); + //ALOGD(" FP is %p, INs live at >= %p", self->interpSave.curFrame, ins); /* put "this" pointer into in0 if appropriate */ if (!dvmIsStaticMethod(method)) { @@ -1100,7 +1100,7 @@ static bool extractMonitorEnterObject(Thread* thread, Object** pLockObj, /* check Method* */ if (!dvmLinearAllocContains(method, sizeof(Method))) { - LOGD("ExtrMon: method %p not valid", method); + ALOGD("ExtrMon: method %p not valid", method); return false; } @@ -1109,14 +1109,14 @@ static bool extractMonitorEnterObject(Thread* thread, Object** pLockObj, if (currentPc < method->insns || currentPc >= method->insns + insnsSize) { - LOGD("ExtrMon: insns %p not valid (%p - %p)", + ALOGD("ExtrMon: insns %p not valid (%p - %p)", currentPc, method->insns, method->insns + insnsSize); return false; } /* check the instruction */ if ((*currentPc & 0xff) != OP_MONITOR_ENTER) { - LOGD("ExtrMon: insn at %p is not monitor-enter (0x%02x)", + ALOGD("ExtrMon: insn at %p is not monitor-enter (0x%02x)", currentPc, *currentPc & 0xff); return false; } @@ -1124,7 +1124,7 @@ static bool extractMonitorEnterObject(Thread* thread, Object** pLockObj, /* get and check the register index */ unsigned int reg = *currentPc >> 8; if (reg >= method->registersSize) { - LOGD("ExtrMon: invalid register %d (max %d)", + ALOGD("ExtrMon: invalid register %d (max %d)", reg, method->registersSize); return false; } @@ -1133,7 +1133,7 @@ static bool extractMonitorEnterObject(Thread* thread, Object** pLockObj, u4* fp = (u4*) framePtr; Object* obj = (Object*) fp[reg]; if (obj != NULL && !dvmIsHeapAddress(obj)) { - LOGD("ExtrMon: invalid object %p at %p[%d]", obj, fp, reg); + ALOGD("ExtrMon: invalid object %p at %p[%d]", obj, fp, reg); return false; } *pLockObj = obj; diff --git a/vm/jdwp/JdwpAdb.cpp b/vm/jdwp/JdwpAdb.cpp index 23878fecd..8c470c192 100644 --- a/vm/jdwp/JdwpAdb.cpp +++ b/vm/jdwp/JdwpAdb.cpp @@ -565,7 +565,7 @@ static bool processIncoming(JdwpState* state) if (netState->wakeFds[0] >= 0 && FD_ISSET(netState->wakeFds[0], &readfds)) { - LOGD("Got wake-up signal, bailing out of select"); + ALOGD("Got wake-up signal, bailing out of select"); goto fail; } if (netState->controlSock >= 0 && @@ -594,7 +594,7 @@ static bool processIncoming(JdwpState* state) /* read failed */ if (errno != EINTR) goto fail; - LOGD("+++ EINTR hit"); + ALOGD("+++ EINTR hit"); return true; } else if (readCount == 0) { /* EOF hit -- far end went away */ diff --git a/vm/jdwp/JdwpEvent.cpp b/vm/jdwp/JdwpEvent.cpp index d6588756b..56e94b3ea 100644 --- a/vm/jdwp/JdwpEvent.cpp +++ b/vm/jdwp/JdwpEvent.cpp @@ -293,7 +293,7 @@ void dvmJdwpUnregisterEventById(JdwpState* state, u4 requestId) pEvent = pEvent->next; } - //LOGD("Odd: no match when removing event reqId=0x%04x", requestId); + //ALOGD("Odd: no match when removing event reqId=0x%04x", requestId); done: unlockEventMutex(state); diff --git a/vm/jdwp/JdwpMain.cpp b/vm/jdwp/JdwpMain.cpp index 94eaa828e..9ba841e22 100644 --- a/vm/jdwp/JdwpMain.cpp +++ b/vm/jdwp/JdwpMain.cpp @@ -96,11 +96,11 @@ JdwpState* dvmJdwpStartup(const JdwpStartupParams* pParams) switch (pParams->transport) { case kJdwpTransportSocket: - // LOGD("prepping for JDWP over TCP"); + // ALOGD("prepping for JDWP over TCP"); state->transport = dvmJdwpSocketTransport(); break; case kJdwpTransportAndroidAdb: - // LOGD("prepping for JDWP over ADB"); + // ALOGD("prepping for JDWP over ADB"); state->transport = dvmJdwpAndroidAdbTransport(); /* TODO */ break; @@ -220,7 +220,7 @@ void dvmJdwpShutdown(JdwpState* state) * Close down the network to inspire the thread to halt. */ if (gDvm.verboseShutdown) - LOGD("JDWP shutting down net..."); + ALOGD("JDWP shutting down net..."); dvmJdwpNetShutdown(state); if (state->debugThreadStarted) { @@ -231,7 +231,7 @@ void dvmJdwpShutdown(JdwpState* state) } if (gDvm.verboseShutdown) - LOGD("JDWP freeing netstate..."); + ALOGD("JDWP freeing netstate..."); dvmJdwpNetFree(state); state->netState = NULL; } @@ -428,7 +428,7 @@ s8 dvmJdwpGetNowMsec() s8 dvmJdwpLastDebuggerActivity(JdwpState* state) { if (!gDvm.debuggerActive) { - LOGD("dvmJdwpLastDebuggerActivity: no active debugger"); + ALOGD("dvmJdwpLastDebuggerActivity: no active debugger"); return -1; } diff --git a/vm/jdwp/JdwpSocket.cpp b/vm/jdwp/JdwpSocket.cpp index 0fc132af0..a5470f930 100644 --- a/vm/jdwp/JdwpSocket.cpp +++ b/vm/jdwp/JdwpSocket.cpp @@ -111,7 +111,7 @@ static bool prepareSocket(JdwpState* state, const JdwpStartupParams* pParams) if (pParams->suspend) LOGI("JDWP will wait for debugger on port %d", port); else - LOGD("JDWP will %s on port %d", + ALOGD("JDWP will %s on port %d", pParams->server ? "listen" : "connect", port); return true; @@ -724,7 +724,7 @@ static bool processIncoming(JdwpState* state) if (netState->listenSock >= 0) LOGE("Exit wake set, but not exiting?"); else - LOGD("Got wake-up signal, bailing out of select"); + ALOGD("Got wake-up signal, bailing out of select"); goto fail; } if (netState->listenSock >= 0 && @@ -754,11 +754,11 @@ static bool processIncoming(JdwpState* state) /* read failed */ if (errno != EINTR) goto fail; - LOGD("+++ EINTR hit"); + ALOGD("+++ EINTR hit"); return true; } else if (readCount == 0) { /* EOF hit -- far end went away */ - LOGD("+++ peer disconnected"); + ALOGD("+++ peer disconnected"); goto fail; } else break; diff --git a/vm/mterp/Mterp.cpp b/vm/mterp/Mterp.cpp index 6220e81f9..7839018c0 100644 --- a/vm/mterp/Mterp.cpp +++ b/vm/mterp/Mterp.cpp @@ -101,6 +101,6 @@ void dvmMterpStd(Thread* self) dvmMterpStdRun(self); #ifdef LOG_INSTR - LOGD("|-- Leaving interpreter loop"); + ALOGD("|-- Leaving interpreter loop"); #endif } diff --git a/vm/mterp/c/gotoTargets.cpp b/vm/mterp/c/gotoTargets.cpp index af6b9d3cf..64d6d2256 100644 --- a/vm/mterp/c/gotoTargets.cpp +++ b/vm/mterp/c/gotoTargets.cpp @@ -745,7 +745,7 @@ GOTO_TARGET(exceptionThrown) if (catchRelPc < 0) { /* falling through to JNI code or off the bottom of the stack */ #if DVM_SHOW_EXCEPTION >= 2 - LOGD("Exception %s from %s:%d not caught locally", + ALOGD("Exception %s from %s:%d not caught locally", exception->clazz->descriptor, dvmGetMethodSourceFile(curMethod), dvmLineNumFromPC(curMethod, pc - curMethod->insns)); #endif @@ -757,7 +757,7 @@ GOTO_TARGET(exceptionThrown) #if DVM_SHOW_EXCEPTION >= 3 { const Method* catchMethod = SAVEAREA_FROM_FP(fp)->method; - LOGD("Exception %s thrown from %s:%d to %s:%d", + ALOGD("Exception %s thrown from %s:%d to %s:%d", exception->clazz->descriptor, dvmGetMethodSourceFile(curMethod), dvmLineNumFromPC(curMethod, pc - curMethod->insns), dvmGetMethodSourceFile(catchMethod), @@ -915,7 +915,7 @@ GOTO_TARGET(invokeMethod, bool methodCallRange, const Method* _methodToCall, assert(dvmCheckException(self)); GOTO_exceptionThrown(); } - //LOGD("+++ fp=%p newFp=%p newSave=%p bottom=%p", + //ALOGD("+++ fp=%p newFp=%p newSave=%p bottom=%p", // fp, newFp, newSaveArea, bottom); } diff --git a/vm/mterp/out/InterpC-allstubs.cpp b/vm/mterp/out/InterpC-allstubs.cpp index da10b5232..b5c7f1588 100644 --- a/vm/mterp/out/InterpC-allstubs.cpp +++ b/vm/mterp/out/InterpC-allstubs.cpp @@ -5150,7 +5150,7 @@ GOTO_TARGET(exceptionThrown) if (catchRelPc < 0) { /* falling through to JNI code or off the bottom of the stack */ #if DVM_SHOW_EXCEPTION >= 2 - LOGD("Exception %s from %s:%d not caught locally", + ALOGD("Exception %s from %s:%d not caught locally", exception->clazz->descriptor, dvmGetMethodSourceFile(curMethod), dvmLineNumFromPC(curMethod, pc - curMethod->insns)); #endif @@ -5162,7 +5162,7 @@ GOTO_TARGET(exceptionThrown) #if DVM_SHOW_EXCEPTION >= 3 { const Method* catchMethod = SAVEAREA_FROM_FP(fp)->method; - LOGD("Exception %s thrown from %s:%d to %s:%d", + ALOGD("Exception %s thrown from %s:%d to %s:%d", exception->clazz->descriptor, dvmGetMethodSourceFile(curMethod), dvmLineNumFromPC(curMethod, pc - curMethod->insns), dvmGetMethodSourceFile(catchMethod), @@ -5320,7 +5320,7 @@ GOTO_TARGET(invokeMethod, bool methodCallRange, const Method* _methodToCall, assert(dvmCheckException(self)); GOTO_exceptionThrown(); } - //LOGD("+++ fp=%p newFp=%p newSave=%p bottom=%p", + //ALOGD("+++ fp=%p newFp=%p newSave=%p bottom=%p", // fp, newFp, newSaveArea, bottom); } diff --git a/vm/mterp/out/InterpC-portable.cpp b/vm/mterp/out/InterpC-portable.cpp index 46c8598d9..3041f9cb2 100644 --- a/vm/mterp/out/InterpC-portable.cpp +++ b/vm/mterp/out/InterpC-portable.cpp @@ -5106,7 +5106,7 @@ GOTO_TARGET(exceptionThrown) if (catchRelPc < 0) { /* falling through to JNI code or off the bottom of the stack */ #if DVM_SHOW_EXCEPTION >= 2 - LOGD("Exception %s from %s:%d not caught locally", + ALOGD("Exception %s from %s:%d not caught locally", exception->clazz->descriptor, dvmGetMethodSourceFile(curMethod), dvmLineNumFromPC(curMethod, pc - curMethod->insns)); #endif @@ -5118,7 +5118,7 @@ GOTO_TARGET(exceptionThrown) #if DVM_SHOW_EXCEPTION >= 3 { const Method* catchMethod = SAVEAREA_FROM_FP(fp)->method; - LOGD("Exception %s thrown from %s:%d to %s:%d", + ALOGD("Exception %s thrown from %s:%d to %s:%d", exception->clazz->descriptor, dvmGetMethodSourceFile(curMethod), dvmLineNumFromPC(curMethod, pc - curMethod->insns), dvmGetMethodSourceFile(catchMethod), @@ -5276,7 +5276,7 @@ GOTO_TARGET(invokeMethod, bool methodCallRange, const Method* _methodToCall, assert(dvmCheckException(self)); GOTO_exceptionThrown(); } - //LOGD("+++ fp=%p newFp=%p newSave=%p bottom=%p", + //ALOGD("+++ fp=%p newFp=%p newSave=%p bottom=%p", // fp, newFp, newSaveArea, bottom); } diff --git a/vm/mterp/out/InterpC-x86-atom.cpp b/vm/mterp/out/InterpC-x86-atom.cpp index 6360c0640..b3f26dbf5 100644 --- a/vm/mterp/out/InterpC-x86-atom.cpp +++ b/vm/mterp/out/InterpC-x86-atom.cpp @@ -2239,7 +2239,7 @@ GOTO_TARGET(exceptionThrown) if (catchRelPc < 0) { /* falling through to JNI code or off the bottom of the stack */ #if DVM_SHOW_EXCEPTION >= 2 - LOGD("Exception %s from %s:%d not caught locally", + ALOGD("Exception %s from %s:%d not caught locally", exception->clazz->descriptor, dvmGetMethodSourceFile(curMethod), dvmLineNumFromPC(curMethod, pc - curMethod->insns)); #endif @@ -2251,7 +2251,7 @@ GOTO_TARGET(exceptionThrown) #if DVM_SHOW_EXCEPTION >= 3 { const Method* catchMethod = SAVEAREA_FROM_FP(fp)->method; - LOGD("Exception %s thrown from %s:%d to %s:%d", + ALOGD("Exception %s thrown from %s:%d to %s:%d", exception->clazz->descriptor, dvmGetMethodSourceFile(curMethod), dvmLineNumFromPC(curMethod, pc - curMethod->insns), dvmGetMethodSourceFile(catchMethod), @@ -2409,7 +2409,7 @@ GOTO_TARGET(invokeMethod, bool methodCallRange, const Method* _methodToCall, assert(dvmCheckException(self)); GOTO_exceptionThrown(); } - //LOGD("+++ fp=%p newFp=%p newSave=%p bottom=%p", + //ALOGD("+++ fp=%p newFp=%p newSave=%p bottom=%p", // fp, newFp, newSaveArea, bottom); } diff --git a/vm/mterp/out/InterpC-x86.cpp b/vm/mterp/out/InterpC-x86.cpp index a4931c033..f300e8ce3 100644 --- a/vm/mterp/out/InterpC-x86.cpp +++ b/vm/mterp/out/InterpC-x86.cpp @@ -2181,7 +2181,7 @@ GOTO_TARGET(exceptionThrown) if (catchRelPc < 0) { /* falling through to JNI code or off the bottom of the stack */ #if DVM_SHOW_EXCEPTION >= 2 - LOGD("Exception %s from %s:%d not caught locally", + ALOGD("Exception %s from %s:%d not caught locally", exception->clazz->descriptor, dvmGetMethodSourceFile(curMethod), dvmLineNumFromPC(curMethod, pc - curMethod->insns)); #endif @@ -2193,7 +2193,7 @@ GOTO_TARGET(exceptionThrown) #if DVM_SHOW_EXCEPTION >= 3 { const Method* catchMethod = SAVEAREA_FROM_FP(fp)->method; - LOGD("Exception %s thrown from %s:%d to %s:%d", + ALOGD("Exception %s thrown from %s:%d to %s:%d", exception->clazz->descriptor, dvmGetMethodSourceFile(curMethod), dvmLineNumFromPC(curMethod, pc - curMethod->insns), dvmGetMethodSourceFile(catchMethod), @@ -2351,7 +2351,7 @@ GOTO_TARGET(invokeMethod, bool methodCallRange, const Method* _methodToCall, assert(dvmCheckException(self)); GOTO_exceptionThrown(); } - //LOGD("+++ fp=%p newFp=%p newSave=%p bottom=%p", + //ALOGD("+++ fp=%p newFp=%p newSave=%p bottom=%p", // fp, newFp, newSaveArea, bottom); } diff --git a/vm/native/InternalNative.cpp b/vm/native/InternalNative.cpp index 1bc14b03c..832032186 100644 --- a/vm/native/InternalNative.cpp +++ b/vm/native/InternalNative.cpp @@ -141,7 +141,7 @@ DalvikNativeFunc dvmLookupInternalNativeMethod(const Method* method) */ void dvmAbstractMethodStub(const u4* args, JValue* pResult) { - LOGD("--- called into dvmAbstractMethodStub"); + ALOGD("--- called into dvmAbstractMethodStub"); dvmThrowAbstractMethodError("abstract method not implemented"); } diff --git a/vm/native/dalvik_system_DexFile.cpp b/vm/native/dalvik_system_DexFile.cpp index 3758b88e7..335b3dd14 100644 --- a/vm/native/dalvik_system_DexFile.cpp +++ b/vm/native/dalvik_system_DexFile.cpp @@ -428,7 +428,7 @@ static void Dalvik_dalvik_system_DexFile_getClassNameList(const u4* args, dvmAllocArrayByClass(arrayClass, count, ALLOC_DEFAULT); if (stringArray == NULL) { /* probably OOM */ - LOGD("Failed allocating array of %d strings", count); + ALOGD("Failed allocating array of %d strings", count); assert(dvmCheckException(self)); RETURN_VOID(); } diff --git a/vm/native/dalvik_system_VMDebug.cpp b/vm/native/dalvik_system_VMDebug.cpp index 9c5c8f41c..1a97462f9 100644 --- a/vm/native/dalvik_system_VMDebug.cpp +++ b/vm/native/dalvik_system_VMDebug.cpp @@ -614,14 +614,14 @@ static void Dalvik_dalvik_system_VMDebug_cacheRegisterMap(const u4* args, } *methodDescr++ = '\0'; - //LOGD("GOT: %s %s %s", classAndMethodDesc, methodName, methodDescr); + //ALOGD("GOT: %s %s %s", classAndMethodDesc, methodName, methodDescr); /* * Find the class, but only if it's already loaded. */ clazz = dvmLookupClass(classAndMethodDesc, NULL, false); if (clazz == NULL) { - LOGD("Class %s not found in bootstrap loader", classAndMethodDesc); + ALOGD("Class %s not found in bootstrap loader", classAndMethodDesc); goto bail; } @@ -722,7 +722,7 @@ static void Dalvik_dalvik_system_VMDebug_infopoint(const u4* args, { gDvm.nativeDebuggerActive = true; - LOGD("VMDebug infopoint %d hit", args[0]); + ALOGD("VMDebug infopoint %d hit", args[0]); gDvm.nativeDebuggerActive = false; RETURN_VOID(); diff --git a/vm/native/java_lang_Class.cpp b/vm/native/java_lang_Class.cpp index 188aa94a9..615c31cc3 100644 --- a/vm/native/java_lang_Class.cpp +++ b/vm/native/java_lang_Class.cpp @@ -500,7 +500,7 @@ static void Dalvik_java_lang_Class_newInstance(const u4* args, JValue* pResult) if (dvmIsPrimitiveClass(clazz) || dvmIsInterfaceClass(clazz) || dvmIsArrayClass(clazz) || dvmIsAbstractClass(clazz)) { - LOGD("newInstance failed: p%d i%d [%d a%d", + ALOGD("newInstance failed: p%d i%d [%d a%d", dvmIsPrimitiveClass(clazz), dvmIsInterfaceClass(clazz), dvmIsArrayClass(clazz), dvmIsAbstractClass(clazz)); dvmThrowInstantiationException(clazz, NULL); @@ -521,7 +521,7 @@ static void Dalvik_java_lang_Class_newInstance(const u4* args, JValue* pResult) init = dvmFindDirectMethodByDescriptor(clazz, "<init>", "()V"); if (init == NULL) { /* common cause: secret "this" arg on non-static inner class ctor */ - LOGD("newInstance failed: no <init>()"); + ALOGD("newInstance failed: no <init>()"); dvmThrowInstantiationException(clazz, "no empty constructor"); RETURN_VOID(); } @@ -539,13 +539,13 @@ static void Dalvik_java_lang_Class_newInstance(const u4* args, JValue* pResult) ClassObject* callerClass = dvmGetCaller2Class(self->interpSave.curFrame); if (!dvmCheckClassAccess(callerClass, clazz)) { - LOGD("newInstance failed: %s not accessible to %s", + ALOGD("newInstance failed: %s not accessible to %s", clazz->descriptor, callerClass->descriptor); dvmThrowIllegalAccessException("access to class not allowed"); RETURN_VOID(); } if (!dvmCheckMethodAccess(callerClass, init)) { - LOGD("newInstance failed: %s.<init>() not accessible to %s", + ALOGD("newInstance failed: %s.<init>() not accessible to %s", clazz->descriptor, callerClass->descriptor); dvmThrowIllegalAccessException("access to constructor not allowed"); RETURN_VOID(); diff --git a/vm/native/java_lang_Runtime.cpp b/vm/native/java_lang_Runtime.cpp index c09b8405b..764aa7f96 100644 --- a/vm/native/java_lang_Runtime.cpp +++ b/vm/native/java_lang_Runtime.cpp @@ -53,7 +53,7 @@ static void Dalvik_java_lang_Runtime_nativeExit(const u4* args, dvmChangeStatus(NULL, THREAD_RUNNING); LOGW("JNI exit hook returned"); } - LOGD("Calling exit(%d)", status); + ALOGD("Calling exit(%d)", status); #if defined(WITH_JIT) && defined(WITH_JIT_TUNING) dvmCompilerDumpStats(); #endif diff --git a/vm/native/java_lang_System.cpp b/vm/native/java_lang_System.cpp index 99b917bca..00bd87f23 100644 --- a/vm/native/java_lang_System.cpp +++ b/vm/native/java_lang_System.cpp @@ -167,7 +167,7 @@ static void Dalvik_java_lang_System_arraycopy(const u4* args, JValue* pResult) RETURN_VOID(); } - if (false) LOGD("arraycopy prim[%c] dst=%p %d src=%p %d len=%d", + if (false) ALOGD("arraycopy prim[%c] dst=%p %d src=%p %d len=%d", srcType, dstArray->contents, dstPos, srcArray->contents, srcPos, length); @@ -221,7 +221,7 @@ static void Dalvik_java_lang_System_arraycopy(const u4* args, JValue* pResult) /* * "dst" can hold "src"; copy the whole thing. */ - if (false) LOGD("arraycopy ref dst=%p %d src=%p %d len=%d", + if (false) ALOGD("arraycopy ref dst=%p %d src=%p %d len=%d", dstArray->contents, dstPos * width, srcArray->contents, srcPos * width, length * width); @@ -266,7 +266,7 @@ static void Dalvik_java_lang_System_arraycopy(const u4* args, JValue* pResult) } } - if (false) LOGD("arraycopy iref dst=%p %d src=%p %d count=%d of %d", + if (false) ALOGD("arraycopy iref dst=%p %d src=%p %d count=%d of %d", dstArray->contents, dstPos * width, srcArray->contents, srcPos * width, copyCount, length); diff --git a/vm/native/java_lang_reflect_Method.cpp b/vm/native/java_lang_reflect_Method.cpp index 164e435ae..33d98c5e6 100644 --- a/vm/native/java_lang_reflect_Method.cpp +++ b/vm/native/java_lang_reflect_Method.cpp @@ -106,7 +106,7 @@ init_failed: /* * If initialization failed, an exception will be raised. */ - LOGD("Method.invoke() on bad class %s failed", + ALOGD("Method.invoke() on bad class %s failed", declaringClass->descriptor); assert(dvmCheckException(dvmThreadSelf())); RETURN_VOID(); diff --git a/vm/oo/Class.cpp b/vm/oo/Class.cpp index 9a1f42a0b..5c4563fc6 100644 --- a/vm/oo/Class.cpp +++ b/vm/oo/Class.cpp @@ -605,7 +605,7 @@ static bool prepareCpe(ClassPathEntry* cpe, bool isBootstrap) struct stat sb; if (stat(cpe->fileName, &sb) < 0) { - LOGD("Unable to stat classpath element '%s'", cpe->fileName); + ALOGD("Unable to stat classpath element '%s'", cpe->fileName); return false; } if (S_ISDIR(sb.st_mode)) { @@ -635,7 +635,7 @@ static bool prepareCpe(ClassPathEntry* cpe, bool isBootstrap) LOGE("Unknown type suffix '%s'", suffix); } - LOGD("Unable to process classpath element '%s'", cpe->fileName); + ALOGD("Unable to process classpath element '%s'", cpe->fileName); return false; } @@ -1376,7 +1376,7 @@ static ClassObject* findClassFromLoaderNoInit(const char* descriptor, Object* excep = dvmGetException(self); if (excep != NULL) { #if DVM_SHOW_EXCEPTION >= 2 - LOGD("NOTE: loadClass '%s' %p threw exception %s", + ALOGD("NOTE: loadClass '%s' %p threw exception %s", dotName, loader, excep->clazz->descriptor); #endif dvmAddTrackedAlloc(excep, self); @@ -2236,7 +2236,7 @@ void dvmMakeCodeReadWrite(Method* meth) assert(!dvmIsNativeMethod(meth) && !dvmIsAbstractMethod(meth)); size_t dexCodeSize = dexGetDexCodeSize(methodDexCode); - LOGD("Making a copy of %s.%s code (%d bytes)", + ALOGD("Making a copy of %s.%s code (%d bytes)", meth->clazz->descriptor, meth->name, dexCodeSize); DexCode* newCode = @@ -2882,7 +2882,7 @@ static bool createVtable(ClassObject* clazz) */ assert(strcmp(clazz->descriptor, "Ljava/lang/Object;") == 0); } - //LOGD("+++ max vmethods for '%s' is %d", clazz->descriptor, maxCount); + //ALOGD("+++ max vmethods for '%s' is %d", clazz->descriptor, maxCount); /* * Over-allocate the table, then realloc it down if necessary. So @@ -3322,7 +3322,7 @@ static bool createIftable(ClassObject* clazz) * massive collection of Miranda methods and a lot of wasted * space, sometimes enough to blow out the LinearAlloc cap. */ - LOGD("Note: class %s has %d unimplemented (abstract) methods", + ALOGD("Note: class %s has %d unimplemented (abstract) methods", clazz->descriptor, mirandaCount); } diff --git a/vm/oo/Object.cpp b/vm/oo/Object.cpp index c1ed33448..8cc09806a 100644 --- a/vm/oo/Object.cpp +++ b/vm/oo/Object.cpp @@ -748,12 +748,12 @@ void dvmDumpObject(const Object* obj) } clazz = obj->clazz; - LOGD("----- Object dump: %p (%s, %d bytes) -----", + ALOGD("----- Object dump: %p (%s, %d bytes) -----", obj, clazz->descriptor, (int) clazz->objectSize); //printHexDump(obj, clazz->objectSize); - LOGD(" Fields:"); + ALOGD(" Fields:"); while (clazz != NULL) { - LOGD(" -- %s", clazz->descriptor); + ALOGD(" -- %s", clazz->descriptor); for (i = 0; i < clazz->ifieldCount; i++) { const InstField* pField = &clazz->ifields[i]; char type = pField->signature[0]; @@ -766,7 +766,7 @@ void dvmDumpObject(const Object* obj) else dval = dvmGetFieldDouble(obj, pField->byteOffset); - LOGD(" %2d: '%s' '%s' af=%04x off=%d %.3f", i, + ALOGD(" %2d: '%s' '%s' af=%04x off=%d %.3f", i, pField->name, pField->signature, pField->accessFlags, pField->byteOffset, dval); } else { @@ -779,7 +779,7 @@ void dvmDumpObject(const Object* obj) else lval = dvmGetFieldInt(obj, pField->byteOffset); - LOGD(" %2d: '%s' '%s' af=%04x off=%d 0x%08llx", i, + ALOGD(" %2d: '%s' '%s' af=%04x off=%d 0x%08llx", i, pField->name, pField->signature, pField->accessFlags, pField->byteOffset, lval); } @@ -788,7 +788,7 @@ void dvmDumpObject(const Object* obj) clazz = clazz->super; } if (dvmIsClassObject(obj)) { - LOGD(" Static fields:"); + ALOGD(" Static fields:"); const StaticField* sfields = &((ClassObject *)obj)->sfields[0]; for (i = 0; i < ((ClassObject *)obj)->sfieldCount; ++i) { const StaticField* pField = &sfields[i]; @@ -803,7 +803,7 @@ void dvmDumpObject(const Object* obj) else dval = pField->value.d; - LOGD(" %2d: '%s' '%s' af=%04x off=%zd %.3f", i, + ALOGD(" %2d: '%s' '%s' af=%04x off=%zd %.3f", i, pField->name, pField->signature, pField->accessFlags, byteOffset, dval); } else { @@ -816,7 +816,7 @@ void dvmDumpObject(const Object* obj) else lval = pField->value.i; - LOGD(" %2d: '%s' '%s' af=%04x off=%zd 0x%08llx", i, + ALOGD(" %2d: '%s' '%s' af=%04x off=%zd 0x%08llx", i, pField->name, pField->signature, pField->accessFlags, byteOffset, lval); } diff --git a/vm/reflect/Annotation.cpp b/vm/reflect/Annotation.cpp index 55de1ad2c..4aa5c06b8 100644 --- a/vm/reflect/Annotation.cpp +++ b/vm/reflect/Annotation.cpp @@ -245,12 +245,12 @@ static Method* resolveAmbiguousMethod(const ClassObject* referrer, u4 methodIdx) resClass = dvmResolveClass(referrer, pMethodId->classIdx, true); if (resClass == NULL) { /* note exception will be pending */ - LOGD("resolveAmbiguousMethod: unable to find class %d", methodIdx); + ALOGD("resolveAmbiguousMethod: unable to find class %d", methodIdx); return NULL; } if (dvmIsInterfaceClass(resClass)) { /* method is part of an interface -- not expecting that */ - LOGD("resolveAmbiguousMethod: method in interface?"); + ALOGD("resolveAmbiguousMethod: method in interface?"); return NULL; } @@ -700,7 +700,7 @@ static Object* createAnnotationMember(const ClassObject* clazz, dvmCallMethod(self, gDvm.methOrgApacheHarmonyLangAnnotationAnnotationMember_init, newMember, &unused, nameObj, valueObj, methodReturn, methodObj); if (dvmCheckException(self)) { - LOGD("Failed constructing annotation element"); + ALOGD("Failed constructing annotation element"); goto bail; } @@ -801,7 +801,7 @@ static Object* processEncodedAnnotation(const ClassObject* clazz, gDvm.methOrgApacheHarmonyLangAnnotationAnnotationFactory_createAnnotation, NULL, &result, annoClass, elementArray); if (dvmCheckException(self)) { - LOGD("Failed creating an annotation"); + ALOGD("Failed creating an annotation"); //dvmLogExceptionStackTrace(); goto bail; } @@ -1476,7 +1476,7 @@ bool dvmGetInnerClass(const ClassObject* clazz, StringObject** pName, /* parse it into an Object */ AnnotationValue avalue; if (!processAnnotationValue(clazz, &ptr, &avalue, kAllObjects)) { - LOGD("processAnnotationValue failed on InnerClass member 'name'"); + ALOGD("processAnnotationValue failed on InnerClass member 'name'"); return false; } @@ -1855,7 +1855,7 @@ Object* dvmGetAnnotationDefaultValue(const Method* method) /* got it, pull it out */ AnnotationValue avalue; if (!processAnnotationValue(clazz, &ptr, &avalue, kAllObjects)) { - LOGD("processAnnotationValue failed on default for '%s'", + ALOGD("processAnnotationValue failed on default for '%s'", method->name); return NULL; } diff --git a/vm/reflect/Proxy.cpp b/vm/reflect/Proxy.cpp index 56f88c56b..b022263e8 100644 --- a/vm/reflect/Proxy.cpp +++ b/vm/reflect/Proxy.cpp @@ -190,7 +190,7 @@ ClassObject* dvmGenerateProxyClass(StringObject* str, ArrayObject* interfaces, */ newClass->status = CLASS_LOADED; if (!dvmLinkClass(newClass)) { - LOGD("Proxy class link failed"); + ALOGD("Proxy class link failed"); goto bail; } diff --git a/vm/reflect/Reflect.cpp b/vm/reflect/Reflect.cpp index 3406a287a..861300f34 100644 --- a/vm/reflect/Reflect.cpp +++ b/vm/reflect/Reflect.cpp @@ -250,7 +250,7 @@ static Object* createFieldObject(Field* field, const ClassObject* clazz) dvmCallMethod(dvmThreadSelf(), gDvm.methJavaLangReflectField_init, fieldObj, &unused, clazz, type, nameObj, slot); if (dvmCheckException(dvmThreadSelf())) { - LOGD("Field class init threw exception"); + ALOGD("Field class init threw exception"); goto bail; } @@ -430,7 +430,7 @@ static Object* createConstructorObject(Method* meth) dvmCallMethod(dvmThreadSelf(), gDvm.methJavaLangReflectConstructor_init, consObj, &unused, meth->clazz, params, exceptions, slot); if (dvmCheckException(dvmThreadSelf())) { - LOGD("Constructor class init threw exception"); + ALOGD("Constructor class init threw exception"); goto bail; } @@ -583,7 +583,7 @@ Object* dvmCreateReflectMethodObject(const Method* meth) methObj, &unused, meth->clazz, params, exceptions, returnType, nameObj, slot); if (dvmCheckException(dvmThreadSelf())) { - LOGD("Method class init threw exception"); + ALOGD("Method class init threw exception"); goto bail; } @@ -1109,7 +1109,7 @@ bool dvmUnboxPrimitive(Object* value, ClassObject* returnType, if (typeIndex == PRIM_NOT) { if (value != NULL && !dvmInstanceof(value->clazz, returnType)) { - LOGD("wrong object type: %s %s", + ALOGD("wrong object type: %s %s", value->clazz->descriptor, returnType->descriptor); return false; } |