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
diff --git a/dexopt/OptMain.cpp b/dexopt/OptMain.cpp
index e0fdb6a..a3345b4 100644
--- a/dexopt/OptMain.cpp
+++ b/dexopt/OptMain.cpp
@@ -241,7 +241,7 @@
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 4a2b47e..52bc500 100644
--- a/libdex/DexFile.cpp
+++ b/libdex/DexFile.cpp
@@ -516,7 +516,7 @@
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 3330164..d5c9528 100644
--- a/libdex/SysUtil.cpp
+++ b/libdex/SysUtil.cpp
@@ -246,7 +246,7 @@
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 @@
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 6e2aee7..75ee031 100644
--- a/libdex/ZipArchive.cpp
+++ b/libdex/ZipArchive.cpp
@@ -170,7 +170,7 @@
}
}
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 9b5657b..d67df1e 100644
--- a/vm/Debugger.cpp
+++ b/vm/Debugger.cpp
@@ -425,7 +425,7 @@
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 @@
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 c1f67d4..84f3407 100644
--- a/vm/DvmDex.cpp
+++ b/vm/DvmDex.cpp
@@ -244,14 +244,14 @@
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 @@
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 ac519a1..1a4fad5 100644
--- a/vm/Exception.cpp
+++ b/vm/Exception.cpp
@@ -681,7 +681,7 @@
}
}
- //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 @@
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 @@
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 @@
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 39d9d86..a4591f1 100644
--- a/vm/Hash.cpp
+++ b/vm/Hash.cpp
@@ -192,7 +192,7 @@
(*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 508ae3d..7712012 100644
--- a/vm/IndirectRefTable.cpp
+++ b/vm/IndirectRefTable.cpp
@@ -233,18 +233,18 @@
}
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 b8fab49..7279a4f 100644
--- a/vm/Init.cpp
+++ b/vm/Init.cpp
@@ -517,13 +517,13 @@
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 @@
* come last.
*/
if (!initJdwp()) {
- LOGD("JDWP init failed; continuing anyway");
+ ALOGD("JDWP init failed; continuing anyway");
}
endJdwp = dvmGetRelativeTimeUsec();
@@ -1693,7 +1693,7 @@
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 2af34b8..a4affb8 100644
--- a/vm/JarFile.cpp
+++ b/vm/JarFile.cpp
@@ -310,7 +310,7 @@
}
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 f5b6005..94c3199 100644
--- a/vm/Jni.cpp
+++ b/vm/Jni.cpp
@@ -171,10 +171,10 @@
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 @@
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 @@
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 @@
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 @@
/* 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 @@
}
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 @@
// (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 @@
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 51c8fcd..6e53ac6 100644
--- a/vm/LinearAlloc.cpp
+++ b/vm/LinearAlloc.cpp
@@ -238,7 +238,7 @@
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 @@
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 ee64e78..a616d1f 100644
--- a/vm/Native.cpp
+++ b/vm/Native.cpp
@@ -184,7 +184,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
* 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 4f3d7d5..d0e2095 100644
--- a/vm/PointerSet.cpp
+++ b/vm/PointerSet.cpp
@@ -148,14 +148,14 @@
* 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 6ada939..07de098 100644
--- a/vm/Profile.cpp
+++ b/vm/Profile.cpp
@@ -263,7 +263,7 @@
dvmCompilerUpdateGlobalState();
#endif
- LOGD("+++ active profiler count now %d", newValue);
+ ALOGD("+++ active profiler count now %d", newValue);
}
@@ -562,7 +562,7 @@
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 @@
/* 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 @@
/* 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 53a8424..1dc12c9 100644
--- a/vm/RawDexFile.cpp
+++ b/vm/RawDexFile.cpp
@@ -199,7 +199,7 @@
}
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 @@
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 a0d5d89..3768357 100644
--- a/vm/SignalCatcher.cpp
+++ b/vm/SignalCatcher.cpp
@@ -239,7 +239,7 @@
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 ffb1d0e..003a6ef 100644
--- a/vm/StdioConverter.cpp
+++ b/vm/StdioConverter.cpp
@@ -117,7 +117,7 @@
printf("Shutting down\n");
fflush(stdout);
- LOGD("Joining stdio converter...");
+ ALOGD("Joining stdio converter...");
pthread_join(gDvm.stdioConverterHandle, NULL);
}
@@ -166,9 +166,9 @@
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 adc46af..6ae23c7 100644
--- a/vm/Thread.cpp
+++ b/vm/Thread.cpp
@@ -58,7 +58,7 @@
// 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 @@
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 @@
} 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 @@
/*
* 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 @@
#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 @@
* 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 @@
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 @@
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 @@
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 @@
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 @@
*/
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 @@
* 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 333b9f9..da395e7 100644
--- a/vm/alloc/CardTable.cpp
+++ b/vm/alloc/CardTable.cpp
@@ -277,7 +277,7 @@
}
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 @@
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 6d219ec..566b371 100644
--- a/vm/alloc/Copying.cpp
+++ b/vm/alloc/Copying.cpp
@@ -1685,7 +1685,7 @@
#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 4043840..8a3c673 100644
--- a/vm/alloc/Heap.cpp
+++ b/vm/alloc/Heap.cpp
@@ -656,7 +656,7 @@
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 @@
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 6d830c7..31998f8 100644
--- a/vm/alloc/Verify.cpp
+++ b/vm/alloc/Verify.cpp
@@ -45,7 +45,7 @@
}
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 @@
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 79527d3..6c91211 100644
--- a/vm/analysis/CodeVerify.cpp
+++ b/vm/analysis/CodeVerify.cpp
@@ -1589,7 +1589,7 @@
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 @@
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 @@
}
//if (changed)
- // LOGD("VFY: marked %d uninitialized registers as invalid", changed);
+ // ALOGD("VFY: marked %d uninitialized registers as invalid", changed);
}
/*
@@ -3146,7 +3146,7 @@
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 @@
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 @@
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 @@
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 @@
}
}
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 @@
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 6d55c03..53922b6 100644
--- a/vm/analysis/DexPrepare.cpp
+++ b/vm/analysis/DexPrepare.cpp
@@ -168,7 +168,7 @@
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 @@
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 @@
* 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 @@
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 @@
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 @@
}
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 @@
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 @@
* 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 @@
* (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 @@
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 @@
}
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 172a227..7623aa1 100644
--- a/vm/analysis/DexVerify.cpp
+++ b/vm/analysis/DexVerify.cpp
@@ -42,7 +42,7 @@
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 @@
* 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 e8f1366..ed23d8f 100644
--- a/vm/analysis/Optimize.cpp
+++ b/vm/analysis/Optimize.cpp
@@ -619,7 +619,7 @@
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 @@
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 @@
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 @@
}
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 @@
}
} 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 @@
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 @@
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 @@
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 3b81672..21b60ef 100644
--- a/vm/analysis/RegisterMap.cpp
+++ b/vm/analysis/RegisterMap.cpp
@@ -316,7 +316,7 @@
}
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 @@
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 @@
}
hexBuf[i * 3] = '\0';
- LOGD(" %04x %s %s", addr, outBuf, hexBuf);
+ ALOGD(" %04x %s %s", addr, outBuf, hexBuf);
}
}
@@ -1023,10 +1023,10 @@
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 @@
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 @@
*/
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 @@
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 @@
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 @@
}
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 77a21c6..46316fe 100644
--- a/vm/analysis/VfyBasicBlock.cpp
+++ b/vm/analysis/VfyBasicBlock.cpp
@@ -382,7 +382,7 @@
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 c08d42d..6e34021 100644
--- a/vm/compiler/Compiler.cpp
+++ b/vm/compiler/Compiler.cpp
@@ -185,7 +185,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
dvmChangeStatus(NULL, THREAD_RUNNING);
if (gDvm.verboseShutdown)
- LOGD("Compiler thread shutting down");
+ ALOGD("Compiler thread shutting down");
return NULL;
}
@@ -781,7 +781,7 @@
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 24ec6c7..7353118 100644
--- a/vm/compiler/Frontend.cpp
+++ b/vm/compiler/Frontend.cpp
@@ -49,7 +49,7 @@
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 @@
(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 @@
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 @@
/* 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 @@
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 @@
}
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 @@
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 @@
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 @@
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 b69faba..b2bff81 100644
--- a/vm/compiler/Utility.cpp
+++ b/vm/compiler/Utility.cpp
@@ -172,10 +172,10 @@
"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 @@
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 @@
/* 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 @@
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 0bbb875..e6075e8 100644
--- a/vm/compiler/codegen/arm/ArchUtility.cpp
+++ b/vm/compiler/codegen/arm/ArchUtility.cpp
@@ -281,7 +281,7 @@
}
}
if (buf[0]) {
- LOGD("%s: %s", prefix, buf);
+ ALOGD("%s: %s", prefix, buf);
}
}
@@ -304,69 +304,69 @@
/* 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 @@
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 @@
/* 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 312e7c1..09d2bc1 100644
--- a/vm/compiler/codegen/arm/Assemble.cpp
+++ b/vm/compiler/codegen/arm/Assemble.cpp
@@ -963,14 +963,14 @@
}
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 @@
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 @@
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 @@
}
}
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
}
- //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 @@
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 @@
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 @@
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 @@
// 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 @@
}
} 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 @@
}
}
} 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 85ecb78..ef0f043 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.cpp
+++ b/vm/compiler/codegen/arm/CodegenDriver.cpp
@@ -2548,7 +2548,7 @@
*/
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 @@
}
}
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 b89437e..98848c7 100644
--- a/vm/compiler/codegen/arm/LocalOptimizations.cpp
+++ b/vm/compiler/codegen/arm/LocalOptimizations.cpp
@@ -45,7 +45,7 @@
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 a5ef56a..789d431 100644
--- a/vm/compiler/codegen/x86/CodegenDriver.cpp
+++ b/vm/compiler/codegen/x86/CodegenDriver.cpp
@@ -287,7 +287,7 @@
}
}
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 7951eff..b0c0553 100644
--- a/vm/interp/Interp.cpp
+++ b/vm/interp/Interp.cpp
@@ -1564,26 +1564,26 @@
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 @@
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 494aae1..2a6bb65 100644
--- a/vm/interp/Jit.cpp
+++ b/vm/interp/Jit.cpp
@@ -74,14 +74,14 @@
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 @@
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 @@
{
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
#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 @@
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 @@
(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 @@
* 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 @@
/* 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 @@
/* 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 f482980..6c8a517 100644
--- a/vm/interp/Stack.cpp
+++ b/vm/interp/Stack.cpp
@@ -455,7 +455,7 @@
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 @@
(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 @@
/* 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 @@
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 @@
/* 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 @@
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 23878fe..8c470c1 100644
--- a/vm/jdwp/JdwpAdb.cpp
+++ b/vm/jdwp/JdwpAdb.cpp
@@ -565,7 +565,7 @@
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 @@
/* 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 d658875..56e94b3 100644
--- a/vm/jdwp/JdwpEvent.cpp
+++ b/vm/jdwp/JdwpEvent.cpp
@@ -293,7 +293,7 @@
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 94eaa82..9ba841e 100644
--- a/vm/jdwp/JdwpMain.cpp
+++ b/vm/jdwp/JdwpMain.cpp
@@ -96,11 +96,11 @@
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 @@
* 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 @@
}
if (gDvm.verboseShutdown)
- LOGD("JDWP freeing netstate...");
+ ALOGD("JDWP freeing netstate...");
dvmJdwpNetFree(state);
state->netState = NULL;
}
@@ -428,7 +428,7 @@
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 0fc132a..a5470f9 100644
--- a/vm/jdwp/JdwpSocket.cpp
+++ b/vm/jdwp/JdwpSocket.cpp
@@ -111,7 +111,7 @@
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 @@
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 @@
/* 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 6220e81..7839018 100644
--- a/vm/mterp/Mterp.cpp
+++ b/vm/mterp/Mterp.cpp
@@ -101,6 +101,6 @@
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 af6b9d3..64d6d22 100644
--- a/vm/mterp/c/gotoTargets.cpp
+++ b/vm/mterp/c/gotoTargets.cpp
@@ -745,7 +745,7 @@
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 @@
#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 @@
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 da10b52..b5c7f15 100644
--- a/vm/mterp/out/InterpC-allstubs.cpp
+++ b/vm/mterp/out/InterpC-allstubs.cpp
@@ -5150,7 +5150,7 @@
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 @@
#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 @@
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 46c8598..3041f9c 100644
--- a/vm/mterp/out/InterpC-portable.cpp
+++ b/vm/mterp/out/InterpC-portable.cpp
@@ -5106,7 +5106,7 @@
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 @@
#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 @@
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 6360c06..b3f26db 100644
--- a/vm/mterp/out/InterpC-x86-atom.cpp
+++ b/vm/mterp/out/InterpC-x86-atom.cpp
@@ -2239,7 +2239,7 @@
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 @@
#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 @@
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 a4931c0..f300e8c 100644
--- a/vm/mterp/out/InterpC-x86.cpp
+++ b/vm/mterp/out/InterpC-x86.cpp
@@ -2181,7 +2181,7 @@
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 @@
#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 @@
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 1bc14b0..8320321 100644
--- a/vm/native/InternalNative.cpp
+++ b/vm/native/InternalNative.cpp
@@ -141,7 +141,7 @@
*/
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 3758b88..335b3dd 100644
--- a/vm/native/dalvik_system_DexFile.cpp
+++ b/vm/native/dalvik_system_DexFile.cpp
@@ -428,7 +428,7 @@
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 9c5c8f4..1a97462 100644
--- a/vm/native/dalvik_system_VMDebug.cpp
+++ b/vm/native/dalvik_system_VMDebug.cpp
@@ -614,14 +614,14 @@
}
*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 @@
{
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 188aa94..615c31c 100644
--- a/vm/native/java_lang_Class.cpp
+++ b/vm/native/java_lang_Class.cpp
@@ -500,7 +500,7 @@
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 @@
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 @@
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 c09b840..764aa7f 100644
--- a/vm/native/java_lang_Runtime.cpp
+++ b/vm/native/java_lang_Runtime.cpp
@@ -53,7 +53,7 @@
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 99b917b..00bd87f 100644
--- a/vm/native/java_lang_System.cpp
+++ b/vm/native/java_lang_System.cpp
@@ -167,7 +167,7 @@
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 @@
/*
* "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 @@
}
}
- 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 164e435..33d98c5 100644
--- a/vm/native/java_lang_reflect_Method.cpp
+++ b/vm/native/java_lang_reflect_Method.cpp
@@ -106,7 +106,7 @@
/*
* 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 9a1f42a..5c4563f 100644
--- a/vm/oo/Class.cpp
+++ b/vm/oo/Class.cpp
@@ -605,7 +605,7 @@
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 @@
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 @@
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 @@
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 @@
*/
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 @@
* 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 c1ed334..8cc0980 100644
--- a/vm/oo/Object.cpp
+++ b/vm/oo/Object.cpp
@@ -748,12 +748,12 @@
}
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 @@
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 @@
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 @@
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 @@
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 @@
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 55de1ad..4aa5c06 100644
--- a/vm/reflect/Annotation.cpp
+++ b/vm/reflect/Annotation.cpp
@@ -245,12 +245,12 @@
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 @@
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 @@
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 @@
/* 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 @@
/* 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 56f88c5..b022263 100644
--- a/vm/reflect/Proxy.cpp
+++ b/vm/reflect/Proxy.cpp
@@ -190,7 +190,7 @@
*/
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 3406a28..861300f 100644
--- a/vm/reflect/Reflect.cpp
+++ b/vm/reflect/Reflect.cpp
@@ -250,7 +250,7 @@
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 @@
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 @@
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 @@
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;
}
