Permalink
Browse files

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Also fix an occurrence of LOGW missed in an earlier change.

Bug: 5449033
Change-Id: I2e3b23839e6dcd09015d6402280e9300c75e3406
  • Loading branch information...
1 parent e8e1ddc commit c1a4ab9c313d8a3d12007f2dbef7b5a6fa4ac2ef Steve Block committed Jan 6, 2012
Showing with 775 additions and 775 deletions.
  1. +10 −10 dexopt/OptMain.cpp
  2. +3 −3 libdex/DexDataMap.cpp
  3. +2 −2 libdex/DexDebugInfo.cpp
  4. +8 −8 libdex/DexFile.cpp
  5. +5 −5 libdex/DexOptData.cpp
  6. +132 −132 libdex/DexSwapVerify.cpp
  7. +2 −2 libdex/OptInvocation.cpp
  8. +8 −8 libdex/SysUtil.cpp
  9. +1 −1 libdex/ZipArchive.cpp
  10. +4 −4 libnativehelper/JNIHelp.cpp
  11. +2 −2 vm/AllocTracker.cpp
  12. +1 −1 vm/AtomicCache.cpp
  13. +3 −3 vm/BitVector.cpp
  14. +15 −15 vm/CheckJni.cpp
  15. +1 −1 vm/Common.h
  16. +1 −1 vm/Ddm.cpp
  17. +10 −10 vm/Debugger.cpp
  18. +5 −5 vm/DvmDex.cpp
  19. +6 −6 vm/Exception.cpp
  20. +1 −1 vm/Hash.cpp
  21. +5 −5 vm/IndirectRefTable.cpp
  22. +16 −16 vm/Init.cpp
  23. +9 −9 vm/InitRefs.cpp
  24. +7 −7 vm/InlineNative.cpp
  25. +6 −6 vm/JarFile.cpp
  26. +19 −19 vm/Jni.cpp
  27. +7 −7 vm/LinearAlloc.cpp
  28. +1 −1 vm/Misc.cpp
  29. +3 −3 vm/Native.cpp
  30. +1 −1 vm/PointerSet.cpp
  31. +8 −8 vm/Profile.cpp
  32. +8 −8 vm/RawDexFile.cpp
  33. +2 −2 vm/ReferenceTable.cpp
  34. +5 −5 vm/SignalCatcher.cpp
  35. +1 −1 vm/StdioConverter.cpp
  36. +3 −3 vm/Sync.cpp
  37. +21 −21 vm/Thread.cpp
  38. +1 −1 vm/UtfString.cpp
  39. +4 −4 vm/alloc/Alloc.cpp
  40. +2 −2 vm/alloc/CardTable.cpp
  41. +5 −5 vm/alloc/Copying.cpp
  42. +1 −1 vm/alloc/HeapBitmap.cpp
  43. +3 −3 vm/alloc/HeapSource.cpp
  44. +2 −2 vm/alloc/TEST/HeapBitmapTest/include/Dalvik.h
  45. +2 −2 vm/alloc/Verify.cpp
  46. +2 −2 vm/alloc/Visit.cpp
  47. +5 −5 vm/analysis/CodeVerify.cpp
  48. +26 −26 vm/analysis/DexPrepare.cpp
  49. +1 −1 vm/analysis/DexVerify.cpp
  50. +1 −1 vm/analysis/Optimize.cpp
  51. +25 −25 vm/analysis/RegisterMap.cpp
  52. +1 −1 vm/analysis/VerifySubs.cpp
  53. +2 −2 vm/arch/generic/Call.cpp
  54. +7 −7 vm/compiler/Compiler.cpp
  55. +2 −2 vm/compiler/Dataflow.cpp
  56. +10 −10 vm/compiler/Frontend.cpp
  57. +1 −1 vm/compiler/InlineTransformation.cpp
  58. +14 −14 vm/compiler/Loop.cpp
  59. +1 −1 vm/compiler/SSATransformation.cpp
  60. +8 −8 vm/compiler/Utility.cpp
  61. +9 −9 vm/compiler/codegen/RallocUtil.cpp
  62. +1 −1 vm/compiler/codegen/arm/ArchFactory.cpp
  63. +10 −10 vm/compiler/codegen/arm/Assemble.cpp
  64. +2 −2 vm/compiler/codegen/arm/CodegenCommon.cpp
  65. +19 −19 vm/compiler/codegen/arm/CodegenDriver.cpp
  66. +10 −10 vm/compiler/codegen/arm/Thumb/Factory.cpp
  67. +1 −1 vm/compiler/codegen/arm/Thumb2/Gen.cpp
  68. +2 −2 vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp
  69. +2 −2 vm/compiler/codegen/arm/armv5te/ArchVariant.cpp
  70. +1 −1 vm/compiler/codegen/arm/armv5te/MethodCodegenDriver.cpp
  71. +2 −2 vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp
  72. +1 −1 vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp
  73. +2 −2 vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp
  74. +1 −1 vm/compiler/codegen/x86/CodegenDriver.cpp
  75. +1 −1 vm/compiler/codegen/x86/ia32/ArchVariant.cpp
  76. +4 −4 vm/hprof/Hprof.cpp
  77. +1 −1 vm/hprof/HprofOutput.cpp
  78. +9 −9 vm/interp/Interp.cpp
  79. +4 −4 vm/interp/Jit.cpp
  80. +7 −7 vm/interp/Stack.cpp
  81. +1 −1 vm/jdwp/ExpandBuf.cpp
  82. +11 −11 vm/jdwp/JdwpAdb.cpp
  83. +2 −2 vm/jdwp/JdwpEvent.cpp
  84. +1 −1 vm/jdwp/JdwpHandler.cpp
  85. +3 −3 vm/jdwp/JdwpMain.cpp
  86. +17 −17 vm/jdwp/JdwpSocket.cpp
  87. +3 −3 vm/mterp/Mterp.cpp
  88. +1 −1 vm/mterp/c/OP_UNUSED_FF.cpp
  89. +3 −3 vm/mterp/c/gotoTargets.cpp
  90. +5 −5 vm/mterp/c/header.cpp
  91. +3 −3 vm/mterp/common/asm-constants.h
  92. +9 −9 vm/mterp/out/InterpC-allstubs.cpp
  93. +5 −5 vm/mterp/out/InterpC-armv5te-vfp.cpp
  94. +5 −5 vm/mterp/out/InterpC-armv5te.cpp
  95. +5 −5 vm/mterp/out/InterpC-armv7-a-neon.cpp
  96. +5 −5 vm/mterp/out/InterpC-armv7-a.cpp
  97. +9 −9 vm/mterp/out/InterpC-portable.cpp
  98. +8 −8 vm/mterp/out/InterpC-x86-atom.cpp
  99. +8 −8 vm/mterp/out/InterpC-x86.cpp
  100. +1 −1 vm/native/dalvik_system_DexFile.cpp
  101. +13 −13 vm/native/dalvik_system_Zygote.cpp
  102. +1 −1 vm/native/java_lang_Class.cpp
  103. +1 −1 vm/native/java_lang_System.cpp
  104. +2 −2 vm/native/java_lang_VMClassLoader.cpp
  105. +6 −6 vm/native/java_lang_reflect_Field.cpp
  106. +3 −3 vm/oo/Array.cpp
  107. +21 −21 vm/oo/Class.cpp
  108. +12 −12 vm/reflect/Annotation.cpp
  109. +4 −4 vm/reflect/Proxy.cpp
  110. +3 −3 vm/reflect/Reflect.cpp
  111. +8 −8 vm/test/TestHash.cpp
  112. +39 −39 vm/test/TestIndirectRefTable.cpp
View
@@ -73,7 +73,7 @@ static int extractAndProcessZip(int zipFd, int cacheFd,
/* make sure we're still at the start of an empty file */
if (lseek(cacheFd, 0, SEEK_END) != 0) {
- LOGE("DexOptZ: new cache file '%s' is not empty", debugFileName);
+ ALOGE("DexOptZ: new cache file '%s' is not empty", debugFileName);
goto bail;
}
@@ -176,7 +176,7 @@ static int extractAndProcessZip(int zipFd, int cacheFd,
if (dvmPrepForDexOpt(bootClassPath, dexOptMode, verifyMode,
dexoptFlags) != 0)
{
- LOGE("DexOptZ: VM init failed");
+ ALOGE("DexOptZ: VM init failed");
goto bail;
}
@@ -186,7 +186,7 @@ static int extractAndProcessZip(int zipFd, int cacheFd,
if (!dvmContinueOptimization(cacheFd, dexOffset, uncompLen, debugFileName,
modWhen, crc32, isBootstrap))
{
- LOGE("Optimization failed");
+ ALOGE("Optimization failed");
goto bail;
}
@@ -214,7 +214,7 @@ static int processZipFile(int zipFd, int cacheFd, const char* zipName,
*/
const char* bcp = getenv("BOOTCLASSPATH");
if (bcp == NULL) {
- LOGE("DexOptZ: BOOTCLASSPATH not set");
+ ALOGE("DexOptZ: BOOTCLASSPATH not set");
return -1;
}
@@ -258,7 +258,7 @@ static int processZipFile(int zipFd, int cacheFd, const char* zipName,
char* endp; \
(_var) = _func(*++argv, &endp, 0); \
if (*endp != '\0') { \
- LOGE("%s '%s'", _msg, *argv); \
+ ALOGE("%s '%s'", _msg, *argv); \
goto bail; \
} \
--argc; \
@@ -292,7 +292,7 @@ static int fromZip(int argc, char* const argv[])
const char* dexoptFlags;
if (argc != 6) {
- LOGE("Wrong number of args for --zip (found %d)", argc);
+ ALOGE("Wrong number of args for --zip (found %d)", argc);
goto bail;
}
@@ -429,7 +429,7 @@ static int fromDex(int argc, char* const argv[])
if (argc < 10) {
/* don't have all mandatory args */
- LOGE("Not enough arguments for --dex (found %d)", argc);
+ ALOGE("Not enough arguments for --dex (found %d)", argc);
goto bail;
}
@@ -442,7 +442,7 @@ static int fromDex(int argc, char* const argv[])
*/
GET_ARG(vmBuildVersion, strtol, "bad vm build");
if (vmBuildVersion != DALVIK_VM_BUILD) {
- LOGE("DexOpt: build rev does not match VM: %d vs %d",
+ ALOGE("DexOpt: build rev does not match VM: %d vs %d",
vmBuildVersion, DALVIK_VM_BUILD);
goto bail;
}
@@ -511,7 +511,7 @@ static int fromDex(int argc, char* const argv[])
}
if (dvmPrepForDexOpt(bootClassPath, dexOptMode, verifyMode, flags) != 0) {
- LOGE("VM init failed");
+ ALOGE("VM init failed");
goto bail;
}
@@ -521,7 +521,7 @@ static int fromDex(int argc, char* const argv[])
if (!dvmContinueOptimization(fd, offset, length, debugFileName,
modWhen, crc, (flags & DEXOPT_IS_BOOTSTRAP) != 0))
{
- LOGE("Optimization failed");
+ ALOGE("Optimization failed");
goto bail;
}
View
@@ -77,7 +77,7 @@ void dexDataMapAdd(DexDataMap* map, u4 offset, u2 type) {
if ((map->count != 0) &&
(map->offsets[map->count - 1] >= offset)) {
- LOGE("Out-of-order data map offset: %#x then %#x",
+ ALOGE("Out-of-order data map offset: %#x then %#x",
map->offsets[map->count - 1], offset);
return;
}
@@ -130,10 +130,10 @@ bool dexDataMapVerify(DexDataMap* map, u4 offset, u2 type) {
}
if (found < 0) {
- LOGE("No data map entry found @ %#x; expected %x",
+ ALOGE("No data map entry found @ %#x; expected %x",
offset, type);
} else {
- LOGE("Unexpected data map entry @ %#x: expected %x, found %x",
+ ALOGE("Unexpected data map entry @ %#x: expected %x, found %x",
offset, type, found);
}
View
@@ -130,9 +130,9 @@ static void emitLocalCbIfLive(void *cnxt, int reg, u4 endAddress,
}
static void invalidStream(const char* classDescriptor, const DexProto* proto) {
- IF_LOGE() {
+ IF_ALOGE() {
char* methodDescriptor = dexProtoCopyMethodDescriptor(proto);
- LOGE("Invalid debug info stream. class %s; proto %s",
+ ALOGE("Invalid debug info stream. class %s; proto %s",
classDescriptor, methodDescriptor);
free(methodDescriptor);
}
View
@@ -294,7 +294,7 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags)
int result = -1;
if (length < sizeof(DexHeader)) {
- LOGE("too short to be a valid .dex");
+ ALOGE("too short to be a valid .dex");
goto bail; /* bad file format */
}
@@ -309,7 +309,7 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags)
if (memcmp(data, DEX_OPT_MAGIC, 4) == 0) {
magic = data;
if (memcmp(magic+4, DEX_OPT_MAGIC_VERS, 4) != 0) {
- LOGE("bad opt version (0x%02x %02x %02x %02x)",
+ ALOGE("bad opt version (0x%02x %02x %02x %02x)",
magic[4], magic[5], magic[6], magic[7]);
goto bail;
}
@@ -326,7 +326,7 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags)
data += pDexFile->pOptHeader->dexOffset;
length -= pDexFile->pOptHeader->dexOffset;
if (pDexFile->pOptHeader->dexLength > length) {
- LOGE("File truncated? stored len=%d, rem len=%d",
+ ALOGE("File truncated? stored len=%d, rem len=%d",
pDexFile->pOptHeader->dexLength, (int) length);
goto bail;
}
@@ -348,7 +348,7 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags)
if (flags & kDexParseVerifyChecksum) {
u4 adler = dexComputeChecksum(pHeader);
if (adler != pHeader->checksum) {
- LOGE("ERROR: bad checksum (%08x vs %08x)",
+ ALOGE("ERROR: bad checksum (%08x vs %08x)",
adler, pHeader->checksum);
if (!(flags & kDexParseContinueOnError))
goto bail;
@@ -360,7 +360,7 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags)
if (pOptHeader != NULL) {
adler = dexComputeOptChecksum(pOptHeader);
if (adler != pOptHeader->checksum) {
- LOGE("ERROR: bad opt checksum (%08x vs %08x)",
+ ALOGE("ERROR: bad opt checksum (%08x vs %08x)",
adler, pOptHeader->checksum);
if (!(flags & kDexParseContinueOnError))
goto bail;
@@ -385,7 +385,7 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags)
if (memcmp(sha1Digest, pHeader->signature, kSHA1DigestLen) != 0) {
char tmpBuf1[kSHA1DigestOutputLen];
char tmpBuf2[kSHA1DigestOutputLen];
- LOGE("ERROR: bad SHA1 digest (%s vs %s)",
+ ALOGE("ERROR: bad SHA1 digest (%s vs %s)",
dexSHA1DigestToStr(sha1Digest, tmpBuf1),
dexSHA1DigestToStr(pHeader->signature, tmpBuf2));
if (!(flags & kDexParseContinueOnError))
@@ -396,14 +396,14 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags)
}
if (pHeader->fileSize != length) {
- LOGE("ERROR: stored file size (%d) != expected (%d)",
+ ALOGE("ERROR: stored file size (%d) != expected (%d)",
(int) pHeader->fileSize, (int) length);
if (!(flags & kDexParseContinueOnError))
goto bail;
}
if (pHeader->classDefsSize == 0) {
- LOGE("ERROR: DEX file has no classes in it, failing");
+ ALOGE("ERROR: DEX file has no classes in it, failing");
goto bail;
}
View
@@ -61,13 +61,13 @@ bool dexParseOptData(const u1* data, size_t length, DexFile* pDexFile)
* properly aligned. This test will catch both of these cases.
*/
if (!isValidPointer(pOpt, pOptStart, pOptEnd)) {
- LOGE("Bogus opt data start pointer");
+ ALOGE("Bogus opt data start pointer");
return false;
}
/* Make sure that the opt data length is a whole number of words. */
if ((optLength & 3) != 0) {
- LOGE("Unaligned opt data area end");
+ ALOGE("Unaligned opt data area end");
return false;
}
@@ -76,14 +76,14 @@ bool dexParseOptData(const u1* data, size_t length, DexFile* pDexFile)
* one chunk header.
*/
if (optLength < 8) {
- LOGE("Undersized opt data area (%u)", optLength);
+ ALOGE("Undersized opt data area (%u)", optLength);
return false;
}
/* Process chunks until we see the end marker. */
while (*pOpt != kDexChunkEnd) {
if (!isValidPointer(pOpt + 2, pOptStart, pOptEnd)) {
- LOGE("Bogus opt data content pointer at offset %u",
+ ALOGE("Bogus opt data content pointer at offset %u",
((const u1*) pOpt) - data);
return false;
}
@@ -99,7 +99,7 @@ bool dexParseOptData(const u1* data, size_t length, DexFile* pDexFile)
const u4* pNextOpt = pOpt + (roundedSize / sizeof(u4));
if (!isValidPointer(pNextOpt, pOptStart, pOptEnd)) {
- LOGE("Opt data area problem for chunk of size %u at offset %u",
+ ALOGE("Opt data area problem for chunk of size %u at offset %u",
size, ((const u1*) pOpt) - data);
return false;
}
Oops, something went wrong.

0 comments on commit c1a4ab9

Please sign in to comment.