diff options
| author | Steve Block <steveblock@google.com> | 2012-01-05 23:21:27 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-06 10:04:42 +0000 |
| commit | e8e1ddccd616e8226b7cc1e4e9fdb327429249e8 (patch) | |
| tree | bd6714388cbff4c72bb5d7dc3d6f90092afa5931 /vm/LinearAlloc.cpp | |
| parent | c6284c2f24d180091a824698c0b0869f491ceccc (diff) | |
| download | android_dalvik-e8e1ddccd616e8226b7cc1e4e9fdb327429249e8.tar.gz android_dalvik-e8e1ddccd616e8226b7cc1e4e9fdb327429249e8.tar.bz2 android_dalvik-e8e1ddccd616e8226b7cc1e4e9fdb327429249e8.zip | |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: Ia5d301248024df26c2a29dabdfe738e39ec87c82
Diffstat (limited to 'vm/LinearAlloc.cpp')
| -rw-r--r-- | vm/LinearAlloc.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vm/LinearAlloc.cpp b/vm/LinearAlloc.cpp index fa5781980..d5490cd27 100644 --- a/vm/LinearAlloc.cpp +++ b/vm/LinearAlloc.cpp @@ -187,14 +187,14 @@ LinearAllocHdr* dvmLinearAllocCreate(Object* classLoader) * the extra page now that we have ashmem?] */ if (mprotect(pHdr->mapAddr, pHdr->mapLength, PROT_NONE) != 0) { - LOGW("LinearAlloc init mprotect failed: %s", strerror(errno)); + ALOGW("LinearAlloc init mprotect failed: %s", strerror(errno)); free(pHdr); return NULL; } if (mprotect(pHdr->mapAddr + SYSTEM_PAGE_SIZE, SYSTEM_PAGE_SIZE, ENFORCE_READ_ONLY ? PROT_READ : PROT_READ|PROT_WRITE) != 0) { - LOGW("LinearAlloc init mprotect #2 failed: %s", strerror(errno)); + ALOGW("LinearAlloc init mprotect #2 failed: %s", strerror(errno)); free(pHdr); return NULL; } @@ -244,7 +244,7 @@ void dvmLinearAllocDestroy(Object* classLoader) } if (munmap(pHdr->mapAddr, pHdr->mapLength) != 0) { - LOGW("LinearAlloc munmap(%p, %d) failed: %s", + ALOGW("LinearAlloc munmap(%p, %d) failed: %s", pHdr->mapAddr, pHdr->mapLength, strerror(errno)); } free(pHdr); @@ -480,7 +480,7 @@ static void updatePages(Object* classLoader, void* mem, int direction) */ if (i == firstPage) { if ((*pLen & LENGTHFLAG_RW) == 0) { - LOGW("Double RO on %p", mem); + ALOGW("Double RO on %p", mem); dvmAbort(); } else *pLen &= ~LENGTHFLAG_RW; @@ -515,7 +515,7 @@ static void updatePages(Object* classLoader, void* mem, int direction) if (i == firstPage) { if ((*pLen & LENGTHFLAG_RW) != 0) { - LOGW("Double RW on %p", mem); + ALOGW("Double RW on %p", mem); dvmAbort(); } else *pLen |= LENGTHFLAG_RW; @@ -675,7 +675,7 @@ static void checkAllFree(Object* classLoader) & ~(BLOCK_ALIGN-1)); if ((rawLen & LENGTHFLAG_FREE) == 0) { - LOGW("LinearAlloc %p not freed: %p len=%d", classLoader, + ALOGW("LinearAlloc %p not freed: %p len=%d", classLoader, pHdr->mapAddr + off + HEADER_EXTRA, rawLen & LENGTHFLAG_MASK); } |