diff options
| author | Steve Block <steveblock@google.com> | 2012-01-06 19:20:56 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-08 13:19:13 +0000 |
| commit | e6f43ddce78d6846af12550ff9193c5c6fe5844b (patch) | |
| tree | 34a2badff01e4bc942327a56268c62909aa7ccbb /libs/binder/MemoryHeapPmem.cpp | |
| parent | 50d76ddfb00f9d461da895f5d65e8331ae331524 (diff) | |
| download | frameworks_native-e6f43ddce78d6846af12550ff9193c5c6fe5844b.zip frameworks_native-e6f43ddce78d6846af12550ff9193c5c6fe5844b.tar.gz frameworks_native-e6f43ddce78d6846af12550ff9193c5c6fe5844b.tar.bz2 | |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
Diffstat (limited to 'libs/binder/MemoryHeapPmem.cpp')
| -rw-r--r-- | libs/binder/MemoryHeapPmem.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/binder/MemoryHeapPmem.cpp b/libs/binder/MemoryHeapPmem.cpp index 03322ea..66bcf4d 100644 --- a/libs/binder/MemoryHeapPmem.cpp +++ b/libs/binder/MemoryHeapPmem.cpp @@ -79,7 +79,7 @@ SubRegionMemory::SubRegionMemory(const sp<MemoryHeapPmem>& heap, int our_fd = heap->heapID(); struct pmem_region sub = { offset, size }; int err = ioctl(our_fd, PMEM_MAP, &sub); - LOGE_IF(err<0, "PMEM_MAP failed (%s), " + ALOGE_IF(err<0, "PMEM_MAP failed (%s), " "mFD=%d, sub.offset=%lu, sub.size=%lu", strerror(errno), our_fd, sub.offset, sub.len); } @@ -115,7 +115,7 @@ void SubRegionMemory::revoke() sub.offset = mOffset; sub.len = mSize; int err = ioctl(our_fd, PMEM_UNMAP, &sub); - LOGE_IF(err<0, "PMEM_UNMAP failed (%s), " + ALOGE_IF(err<0, "PMEM_UNMAP failed (%s), " "mFD=%d, sub.offset=%lu, sub.size=%lu", strerror(errno), our_fd, sub.offset, sub.len); mSize = 0; @@ -133,11 +133,11 @@ MemoryHeapPmem::MemoryHeapPmem(const sp<MemoryHeapBase>& pmemHeap, #ifdef HAVE_ANDROID_OS if (device) { int fd = open(device, O_RDWR | (flags & NO_CACHING ? O_SYNC : 0)); - LOGE_IF(fd<0, "couldn't open %s (%s)", device, strerror(errno)); + ALOGE_IF(fd<0, "couldn't open %s (%s)", device, strerror(errno)); if (fd >= 0) { int err = ioctl(fd, PMEM_CONNECT, pmemHeap->heapID()); if (err < 0) { - LOGE("PMEM_CONNECT failed (%s), mFD=%d, sub-fd=%d", + ALOGE("PMEM_CONNECT failed (%s), mFD=%d, sub-fd=%d", strerror(errno), fd, pmemHeap->heapID()); close(fd); } else { @@ -194,7 +194,7 @@ status_t MemoryHeapPmem::slap() int our_fd = getHeapID(); struct pmem_region sub = { 0, size }; int err = ioctl(our_fd, PMEM_MAP, &sub); - LOGE_IF(err<0, "PMEM_MAP failed (%s), " + ALOGE_IF(err<0, "PMEM_MAP failed (%s), " "mFD=%d, sub.offset=%lu, sub.size=%lu", strerror(errno), our_fd, sub.offset, sub.len); return -errno; @@ -212,7 +212,7 @@ status_t MemoryHeapPmem::unslap() int our_fd = getHeapID(); struct pmem_region sub = { 0, size }; int err = ioctl(our_fd, PMEM_UNMAP, &sub); - LOGE_IF(err<0, "PMEM_UNMAP failed (%s), " + ALOGE_IF(err<0, "PMEM_UNMAP failed (%s), " "mFD=%d, sub.offset=%lu, sub.size=%lu", strerror(errno), our_fd, sub.offset, sub.len); return -errno; |