openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE 

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

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
This commit is contained in:
Steve Block 2011-10-20 11:56:00 +01:00 committed by Alex Ray
parent 8b4cf779b2
commit b37fbe9f81
10 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/utils/Asset.cpp
View File

@ -585,7 +585,7 @@ const void* _FileAsset::getBuffer(bool wordAligned)
return NULL;
}
LOGV("Asset %p allocating buffer size %d (smaller than threshold)", this, (int)allocLen);
ALOGV("Asset %p allocating buffer size %d (smaller than threshold)", this, (int)allocLen);
if (mLength > 0) {
long oldPosn = ftell(mFp);
fseek(mFp, mStart, SEEK_SET);
@ -597,7 +597,7 @@ const void* _FileAsset::getBuffer(bool wordAligned)
fseek(mFp, oldPosn, SEEK_SET);
}
LOGV(" getBuffer: loaded into buffer\n");
ALOGV(" getBuffer: loaded into buffer\n");
mBuf = buf;
return mBuf;
@ -610,7 +610,7 @@ const void* _FileAsset::getBuffer(bool wordAligned)
return NULL;
}
LOGV(" getBuffer: mapped\n");
ALOGV(" getBuffer: mapped\n");
mMap = map;
if (!wordAligned) {
@ -648,13 +648,13 @@ const void* _FileAsset::ensureAlignment(FileMap* map)
if ((((size_t)data)&0x3) == 0) {
// We can return this directly if it is aligned on a word
// boundary.
LOGV("Returning aligned FileAsset %p (%s).", this,
ALOGV("Returning aligned FileAsset %p (%s).", this,
getAssetSource());
return data;
}
// If not aligned on a word boundary, then we need to copy it into
// our own buffer.
LOGV("Copying FileAsset %p (%s) to buffer size %d to make it aligned.", this,
ALOGV("Copying FileAsset %p (%s) to buffer size %d to make it aligned.", this,
getAssetSource(), (int)mLength);
unsigned char* buf = new unsigned char[mLength];
if (buf == NULL) {

50
libs/utils/AssetManager.cpp
View File

@ -167,7 +167,7 @@ bool AssetManager::addAssetPath(const String8& path, void** cookie)
}
}
LOGV("In %p Asset %s path: %s", this,
ALOGV("In %p Asset %s path: %s", this,
ap.type == kFileTypeDirectory ? "dir" : "zip", ap.path.string());
mAssetPaths.add(ap);
@ -498,7 +498,7 @@ Asset* AssetManager::open(const char* fileName, AccessMode mode)
size_t i = mAssetPaths.size();
while (i > 0) {
i--;
LOGV("Looking for asset '%s' in '%s'\n",
ALOGV("Looking for asset '%s' in '%s'\n",
assetName.string(), mAssetPaths.itemAt(i).path.string());
Asset* pAsset = openNonAssetInPathLocked(assetName.string(), mode, mAssetPaths.itemAt(i));
if (pAsset != NULL) {
@ -532,7 +532,7 @@ Asset* AssetManager::openNonAsset(const char* fileName, AccessMode mode)
size_t i = mAssetPaths.size();
while (i > 0) {
i--;
LOGV("Looking for non-asset '%s' in '%s'\n", fileName, mAssetPaths.itemAt(i).path.string());
ALOGV("Looking for non-asset '%s' in '%s'\n", fileName, mAssetPaths.itemAt(i).path.string());
Asset* pAsset = openNonAssetInPathLocked(
fileName, mode, mAssetPaths.itemAt(i));
if (pAsset != NULL) {
@ -556,7 +556,7 @@ Asset* AssetManager::openNonAsset(void* cookie, const char* fileName, AccessMode
loadFileNameCacheLocked();
if (which < mAssetPaths.size()) {
LOGV("Looking for non-asset '%s' in '%s'\n", fileName,
ALOGV("Looking for non-asset '%s' in '%s'\n", fileName,
mAssetPaths.itemAt(which).path.string());
Asset* pAsset = openNonAssetInPathLocked(
fileName, mode, mAssetPaths.itemAt(which));
@ -621,7 +621,7 @@ const ResTable* AssetManager::getResTable(bool required) const
bool shared = true;
const asset_path& ap = mAssetPaths.itemAt(i);
Asset* idmap = openIdmapLocked(ap);
LOGV("Looking for resource asset in '%s'\n", ap.path.string());
ALOGV("Looking for resource asset in '%s'\n", ap.path.string());
if (ap.type != kFileTypeDirectory) {
if (i == 0) {
// The first item is typically the framework resources,
@ -633,7 +633,7 @@ const ResTable* AssetManager::getResTable(bool required) const
ass = const_cast<AssetManager*>(this)->
mZipSet.getZipResourceTableAsset(ap.path);
if (ass == NULL) {
LOGV("loading resource table %s\n", ap.path.string());
ALOGV("loading resource table %s\n", ap.path.string());
ass = const_cast<AssetManager*>(this)->
openNonAssetInPathLocked("resources.arsc",
Asset::ACCESS_BUFFER,
@ -648,7 +648,7 @@ const ResTable* AssetManager::getResTable(bool required) const
// If this is the first resource table in the asset
// manager, then we are going to cache it so that we
// can quickly copy it out for others.
LOGV("Creating shared resources for %s", ap.path.string());
ALOGV("Creating shared resources for %s", ap.path.string());
sharedRes = new ResTable();
sharedRes->add(ass, (void*)(i+1), false, idmap);
sharedRes = const_cast<AssetManager*>(this)->
@ -656,7 +656,7 @@ const ResTable* AssetManager::getResTable(bool required) const
}
}
} else {
LOGV("loading resource table %s\n", ap.path.string());
ALOGV("loading resource table %s\n", ap.path.string());
Asset* ass = const_cast<AssetManager*>(this)->
openNonAssetInPathLocked("resources.arsc",
Asset::ACCESS_BUFFER,
@ -668,12 +668,12 @@ const ResTable* AssetManager::getResTable(bool required) const
mResources = rt = new ResTable();
updateResourceParamsLocked();
}
LOGV("Installing resource asset %p in to table %p\n", ass, mResources);
ALOGV("Installing resource asset %p in to table %p\n", ass, mResources);
if (sharedRes != NULL) {
LOGV("Copying existing resources for %s", ap.path.string());
ALOGV("Copying existing resources for %s", ap.path.string());
rt->add(sharedRes);
} else {
LOGV("Parsing resources for %s", ap.path.string());
ALOGV("Parsing resources for %s", ap.path.string());
rt->add(ass, (void*)(i+1), !shared, idmap);
}
@ -725,7 +725,7 @@ Asset* AssetManager::openIdmapLocked(const struct asset_path& ap) const
ass = const_cast<AssetManager*>(this)->
openAssetFromFileLocked(ap.idmap, Asset::ACCESS_BUFFER);
if (ass) {
LOGV("loading idmap %s\n", ap.idmap.string());
ALOGV("loading idmap %s\n", ap.idmap.string());
} else {
LOGW("failed to load idmap %s\n", ap.idmap.string());
}
@ -1019,7 +1019,7 @@ String8 AssetManager::createPathNameLocked(const asset_path& ap, const char* roo
*/
ZipFileRO* AssetManager::getZipFileLocked(const asset_path& ap)
{
LOGV("getZipFileLocked() in %p\n", this);
ALOGV("getZipFileLocked() in %p\n", this);
return mZipSet.getZip(ap.path);
}
@ -1086,12 +1086,12 @@ Asset* AssetManager::openAssetFromZipLocked(const ZipFileRO* pZipFile,
if (method == ZipFileRO::kCompressStored) {
pAsset = Asset::createFromUncompressedMap(dataMap, mode);
LOGV("Opened uncompressed entry %s in zip %s mode %d: %p", entryName.string(),
ALOGV("Opened uncompressed entry %s in zip %s mode %d: %p", entryName.string(),
dataMap->getFileName(), mode, pAsset);
} else {
pAsset = Asset::createFromCompressedMap(dataMap, method,
uncompressedLen, mode);
LOGV("Opened compressed entry %s in zip %s mode %d: %p", entryName.string(),
ALOGV("Opened compressed entry %s in zip %s mode %d: %p", entryName.string(),
dataMap->getFileName(), mode, pAsset);
}
if (pAsset == NULL) {
@ -1146,10 +1146,10 @@ AssetDir* AssetManager::openDir(const char* dirName)
i--;
const asset_path& ap = mAssetPaths.itemAt(i);
if (ap.type == kFileTypeRegular) {
LOGV("Adding directory %s from zip %s", dirName, ap.path.string());
ALOGV("Adding directory %s from zip %s", dirName, ap.path.string());
scanAndMergeZipLocked(pMergedInfo, ap, kAssetsRoot, dirName);
} else {
LOGV("Adding directory %s from dir %s", dirName, ap.path.string());
ALOGV("Adding directory %s from dir %s", dirName, ap.path.string());
scanAndMergeDirLocked(pMergedInfo, ap, kAssetsRoot, dirName);
}
}
@ -1200,10 +1200,10 @@ AssetDir* AssetManager::openNonAssetDir(void* cookie, const char* dirName)
if (which < mAssetPaths.size()) {
const asset_path& ap = mAssetPaths.itemAt(which);
if (ap.type == kFileTypeRegular) {
LOGV("Adding directory %s from zip %s", dirName, ap.path.string());
ALOGV("Adding directory %s from zip %s", dirName, ap.path.string());
scanAndMergeZipLocked(pMergedInfo, ap, NULL, dirName);
} else {
LOGV("Adding directory %s from dir %s", dirName, ap.path.string());
ALOGV("Adding directory %s from dir %s", dirName, ap.path.string());
scanAndMergeDirLocked(pMergedInfo, ap, NULL, dirName);
}
}
@ -1325,7 +1325,7 @@ bool AssetManager::scanAndMergeDirLocked(SortedVector<AssetDir::FileInfo>* pMerg
matchIdx = AssetDir::FileInfo::findEntry(pMergedInfo, match);
if (matchIdx > 0) {
LOGV("Excluding '%s' [%s]\n",
ALOGV("Excluding '%s' [%s]\n",
pMergedInfo->itemAt(matchIdx).getFileName().string(),
pMergedInfo->itemAt(matchIdx).getSourceName().string());
pMergedInfo->removeAt(matchIdx);
@ -1365,7 +1365,7 @@ SortedVector<AssetDir::FileInfo>* AssetManager::scanDirLocked(const String8& pat
struct dirent* entry;
FileType fileType;
LOGV("Scanning dir '%s'\n", path.string());
ALOGV("Scanning dir '%s'\n", path.string());
dir = opendir(path.string());
if (dir == NULL)
@ -1782,7 +1782,7 @@ AssetManager::SharedZip::SharedZip(const String8& path, time_t modWhen)
{
//LOGI("Creating SharedZip %p %s\n", this, (const char*)mPath);
mZipFile = new ZipFileRO;
LOGV("+++ opening zip '%s'\n", mPath.string());
ALOGV("+++ opening zip '%s'\n", mPath.string());
if (mZipFile->open(mPath.string()) != NO_ERROR) {
LOGD("failed to open Zip archive '%s'\n", mPath.string());
delete mZipFile;
@ -1811,7 +1811,7 @@ ZipFileRO* AssetManager::SharedZip::getZip()
Asset* AssetManager::SharedZip::getResourceTableAsset()
{
LOGV("Getting from SharedZip %p resource asset %p\n", this, mResourceTableAsset);
ALOGV("Getting from SharedZip %p resource asset %p\n", this, mResourceTableAsset);
return mResourceTableAsset;
}
@ -1833,7 +1833,7 @@ Asset* AssetManager::SharedZip::setResourceTableAsset(Asset* asset)
ResTable* AssetManager::SharedZip::getResourceTable()
{
LOGV("Getting from SharedZip %p resource table %p\n", this, mResourceTable);
ALOGV("Getting from SharedZip %p resource table %p\n", this, mResourceTable);
return mResourceTable;
}
@ -1867,7 +1867,7 @@ AssetManager::SharedZip::~SharedZip()
}
if (mZipFile != NULL) {
delete mZipFile;
LOGV("Closed '%s'\n", mPath.string());
ALOGV("Closed '%s'\n", mPath.string());
}
}

24
libs/utils/BlobCache.cpp
View File

@ -38,23 +38,23 @@ BlobCache::BlobCache(size_t maxKeySize, size_t maxValueSize, size_t maxTotalSize
mRandState[1] = (now >> 16) & 0xFFFF;
mRandState[2] = (now >> 32) & 0xFFFF;
#endif
LOGV("initializing random seed using %lld", now);
ALOGV("initializing random seed using %lld", now);
}
void BlobCache::set(const void* key, size_t keySize, const void* value,
size_t valueSize) {
if (mMaxKeySize < keySize) {
LOGV("set: not caching because the key is too large: %d (limit: %d)",
ALOGV("set: not caching because the key is too large: %d (limit: %d)",
keySize, mMaxKeySize);
return;
}
if (mMaxValueSize < valueSize) {
LOGV("set: not caching because the value is too large: %d (limit: %d)",
ALOGV("set: not caching because the value is too large: %d (limit: %d)",
valueSize, mMaxValueSize);
return;
}
if (mMaxTotalSize < keySize + valueSize) {
LOGV("set: not caching because the combined key/value size is too "
ALOGV("set: not caching because the combined key/value size is too "
"large: %d (limit: %d)", keySize + valueSize, mMaxTotalSize);
return;
}
@ -85,7 +85,7 @@ void BlobCache::set(const void* key, size_t keySize, const void* value,
clean();
continue;
} else {
LOGV("set: not caching new key/value pair because the "
ALOGV("set: not caching new key/value pair because the "
"total cache size limit would be exceeded: %d "
"(limit: %d)",
keySize + valueSize, mMaxTotalSize);
@ -94,7 +94,7 @@ void BlobCache::set(const void* key, size_t keySize, const void* value,
}
mCacheEntries.add(CacheEntry(keyBlob, valueBlob));
mTotalSize = newTotalSize;
LOGV("set: created new cache entry with %d byte key and %d byte value",
ALOGV("set: created new cache entry with %d byte key and %d byte value",
keySize, valueSize);
} else {
// Update the existing cache entry.
@ -107,7 +107,7 @@ void BlobCache::set(const void* key, size_t keySize, const void* value,
clean();
continue;
} else {
LOGV("set: not caching new value because the total cache "
ALOGV("set: not caching new value because the total cache "
"size limit would be exceeded: %d (limit: %d)",
keySize + valueSize, mMaxTotalSize);
break;
@ -115,7 +115,7 @@ void BlobCache::set(const void* key, size_t keySize, const void* value,
}
mCacheEntries.editItemAt(index).setValue(valueBlob);
mTotalSize = newTotalSize;
LOGV("set: updated existing cache entry with %d byte key and %d byte "
ALOGV("set: updated existing cache entry with %d byte key and %d byte "
"value", keySize, valueSize);
}
break;
@ -125,7 +125,7 @@ void BlobCache::set(const void* key, size_t keySize, const void* value,
size_t BlobCache::get(const void* key, size_t keySize, void* value,
size_t valueSize) {
if (mMaxKeySize < keySize) {
LOGV("get: not searching because the key is too large: %d (limit %d)",
ALOGV("get: not searching because the key is too large: %d (limit %d)",
keySize, mMaxKeySize);
return 0;
}
@ -134,7 +134,7 @@ size_t BlobCache::get(const void* key, size_t keySize, void* value,
CacheEntry dummyEntry(dummyKey, NULL);
ssize_t index = mCacheEntries.indexOf(dummyEntry);
if (index < 0) {
LOGV("get: no cache entry found for key of size %d", keySize);
ALOGV("get: no cache entry found for key of size %d", keySize);
return 0;
}
@ -143,10 +143,10 @@ size_t BlobCache::get(const void* key, size_t keySize, void* value,
sp<Blob> valueBlob(mCacheEntries[index].getValue());
size_t valueBlobSize = valueBlob->getSize();
if (valueBlobSize <= valueSize) {
LOGV("get: copying %d bytes to caller's buffer", valueBlobSize);
ALOGV("get: copying %d bytes to caller's buffer", valueBlobSize);
memcpy(value, valueBlob->getData(), valueBlobSize);
} else {
LOGV("get: caller's buffer is too small for value: %d (needs %d)",
ALOGV("get: caller's buffer is too small for value: %d (needs %d)",
valueSize, valueBlobSize);
}
return valueBlobSize;

2
libs/utils/FileMap.cpp
View File

@ -190,7 +190,7 @@ try_again:
assert(mBasePtr != NULL);
LOGV("MAP: base %p/%d data %p/%d\n",
ALOGV("MAP: base %p/%d data %p/%d\n",
mBasePtr, (int) mBaseLength, mDataPtr, (int) mDataLength);
return true;

2
libs/utils/RefBase.cpp
View File

@ -421,7 +421,7 @@ void RefBase::weakref_type::decWeak(const void* id)
// destroy the object now.
delete impl->mBase;
} else {
// LOGV("Freeing refs %p of old RefBase %p\n", this, impl->mBase);
// ALOGV("Freeing refs %p of old RefBase %p\n", this, impl->mBase);
delete impl;
}
} else {

22
libs/utils/ResourceTypes.cpp
View File

@ -69,7 +69,7 @@ namespace android {
static void printToLogFunc(void* cookie, const char* txt)
{
LOGV("%s", txt);
ALOGV("%s", txt);
}
// Standard C isspace() is only required to look at the low byte of its input, so
@ -1867,7 +1867,7 @@ status_t ResTable::add(const void* data, size_t size, void* cookie,
const bool notDeviceEndian = htods(0xf0) != 0xf0;
LOAD_TABLE_NOISY(
LOGV("Adding resources to ResTable: data=%p, size=0x%x, cookie=%p, asset=%p, copy=%d "
ALOGV("Adding resources to ResTable: data=%p, size=0x%x, cookie=%p, asset=%p, copy=%d "
"idmap=%p\n", data, size, cookie, asset, copyData, idmap));
if (copyData || notDeviceEndian) {
@ -2122,7 +2122,7 @@ ssize_t ResTable::getResource(uint32_t resID, Res_value* outValue, bool mayBeBag
resID, &overlayResID);
if (retval == NO_ERROR && overlayResID != 0x0) {
// for this loop iteration, this is the type and entry we really want
LOGV("resource map 0x%08x -> 0x%08x\n", resID, overlayResID);
ALOGV("resource map 0x%08x -> 0x%08x\n", resID, overlayResID);
T = Res_GETTYPE(overlayResID);
E = Res_GETENTRY(overlayResID);
} else {
@ -2401,7 +2401,7 @@ ssize_t ResTable::getBagLocked(uint32_t resID, const bag_entry** outBag,
resID, &overlayResID);
if (retval == NO_ERROR && overlayResID != 0x0) {
// for this loop iteration, this is the type and entry we really want
LOGV("resource map 0x%08x -> 0x%08x\n", resID, overlayResID);
ALOGV("resource map 0x%08x -> 0x%08x\n", resID, overlayResID);
T = Res_GETTYPE(overlayResID);
E = Res_GETENTRY(overlayResID);
} else {
@ -2413,9 +2413,9 @@ ssize_t ResTable::getBagLocked(uint32_t resID, const bag_entry** outBag,
const ResTable_type* type;
const ResTable_entry* entry;
const Type* typeClass;
LOGV("Getting entry pkg=%p, t=%d, e=%d\n", package, T, E);
ALOGV("Getting entry pkg=%p, t=%d, e=%d\n", package, T, E);
ssize_t offset = getEntry(package, T, E, &mParams, &type, &entry, &typeClass);
LOGV("Resulting offset=%d\n", offset);
ALOGV("Resulting offset=%d\n", offset);
if (offset <= 0) {
// No {entry, appropriate config} pair found in package. If this
// package is an overlay package (ip != 0), this simply means the
@ -3898,9 +3898,9 @@ void ResTable::getConfigurations(Vector<ResTable_config>* configs) const
void ResTable::getLocales(Vector<String8>* locales) const
{
Vector<ResTable_config> configs;
LOGV("calling getConfigurations");
ALOGV("calling getConfigurations");
getConfigurations(&configs);
LOGV("called getConfigurations size=%d", (int)configs.size());
ALOGV("called getConfigurations size=%d", (int)configs.size());
const size_t I = configs.size();
for (size_t i=0; i<I; i++) {
char locale[6];
@ -3924,13 +3924,13 @@ ssize_t ResTable::getEntry(
const ResTable_type** outType, const ResTable_entry** outEntry,
const Type** outTypeClass) const
{
LOGV("Getting entry from package %p\n", package);
ALOGV("Getting entry from package %p\n", package);
const ResTable_package* const pkg = package->package;
const Type* allTypes = package->getType(typeIndex);
LOGV("allTypes=%p\n", allTypes);
ALOGV("allTypes=%p\n", allTypes);
if (allTypes == NULL) {
LOGV("Skipping entry type index 0x%02x because type is NULL!\n", typeIndex);
ALOGV("Skipping entry type index 0x%02x because type is NULL!\n", typeIndex);
return 0;
}

8
libs/utils/StreamingZipInflater.cpp
View File

@ -77,7 +77,7 @@ StreamingZipInflater::~StreamingZipInflater() {
}
void StreamingZipInflater::initInflateState() {
LOGV("Initializing inflate state");
ALOGV("Initializing inflate state");
memset(&mInflateState, 0, sizeof(mInflateState));
mInflateState.zalloc = Z_NULL;
@ -152,13 +152,13 @@ ssize_t StreamingZipInflater::read(void* outBuf, size_t count) {
mInflateState.avail_out = mOutBufSize;
/*
LOGV("Inflating to outbuf: avail_in=%u avail_out=%u next_in=%p next_out=%p",
ALOGV("Inflating to outbuf: avail_in=%u avail_out=%u next_in=%p next_out=%p",
mInflateState.avail_in, mInflateState.avail_out,
mInflateState.next_in, mInflateState.next_out);
*/
int result = Z_OK;
if (mStreamNeedsInit) {
LOGV("Initializing zlib to inflate");
ALOGV("Initializing zlib to inflate");
result = inflateInit2(&mInflateState, -MAX_WBITS);
mStreamNeedsInit = false;
}
@ -192,7 +192,7 @@ int StreamingZipInflater::readNextChunk() {
size_t toRead = min_of(mInBufSize, mInTotalSize - mInNextChunkOffset);
if (toRead > 0) {
ssize_t didRead = ::read(mFd, mInBuf, toRead);
//LOGV("Reading input chunk, size %08x didread %08x", toRead, didRead);
//ALOGV("Reading input chunk, size %08x didread %08x", toRead, didRead);
if (didRead < 0) {
// TODO: error
LOGE("Error reading asset data");

8
libs/utils/VectorImpl.cpp
View File

@ -346,7 +346,7 @@ void VectorImpl::release_storage()
void* VectorImpl::_grow(size_t where, size_t amount)
{
// LOGV("_grow(this=%p, where=%d, amount=%d) count=%d, capacity=%d",
// ALOGV("_grow(this=%p, where=%d, amount=%d) count=%d, capacity=%d",
// this, (int)where, (int)amount, (int)mCount, (int)capacity());
LOG_ASSERT(where <= mCount,
@ -356,7 +356,7 @@ void* VectorImpl::_grow(size_t where, size_t amount)
const size_t new_size = mCount + amount;
if (capacity() < new_size) {
const size_t new_capacity = max(kMinVectorCapacity, ((new_size*3)+1)/2);
// LOGV("grow vector %p, new_capacity=%d", this, (int)new_capacity);
// ALOGV("grow vector %p, new_capacity=%d", this, (int)new_capacity);
if ((mStorage) &&
(mCount==where) &&
(mFlags & HAS_TRIVIAL_COPY) &&
@ -399,7 +399,7 @@ void VectorImpl::_shrink(size_t where, size_t amount)
if (!mStorage)
return;
// LOGV("_shrink(this=%p, where=%d, amount=%d) count=%d, capacity=%d",
// ALOGV("_shrink(this=%p, where=%d, amount=%d) count=%d, capacity=%d",
// this, (int)where, (int)amount, (int)mCount, (int)capacity());
LOG_ASSERT(where + amount <= mCount,
@ -409,7 +409,7 @@ void VectorImpl::_shrink(size_t where, size_t amount)
const size_t new_size = mCount - amount;
if (new_size*3 < capacity()) {
const size_t new_capacity = max(kMinVectorCapacity, new_size*2);
// LOGV("shrink vector %p, new_capacity=%d", this, (int)new_capacity);
// ALOGV("shrink vector %p, new_capacity=%d", this, (int)new_capacity);
if ((where == new_size) &&
(mFlags & HAS_TRIVIAL_COPY) &&
(mFlags & HAS_TRIVIAL_DTOR))

8
libs/utils/ZipFileRO.cpp
View File

@ -222,7 +222,7 @@ bool ZipFileRO::mapCentralDirectory(void)
free(scanBuf);
return false;
} else if (header != kLFHSignature) {
LOGV("Not a Zip archive (found 0x%08x)\n", header);
ALOGV("Not a Zip archive (found 0x%08x)\n", header);
free(scanBuf);
return false;
}
@ -264,7 +264,7 @@ bool ZipFileRO::mapCentralDirectory(void)
int i;
for (i = readAmount - kEOCDLen; i >= 0; i--) {
if (scanBuf[i] == 0x50 && get4LE(&scanBuf[i]) == kEOCDSignature) {
LOGV("+++ Found EOCD at buf+%d\n", i);
ALOGV("+++ Found EOCD at buf+%d\n", i);
break;
}
}
@ -299,7 +299,7 @@ bool ZipFileRO::mapCentralDirectory(void)
return false;
}
LOGV("+++ numEntries=%d dirSize=%d dirOffset=%d\n",
ALOGV("+++ numEntries=%d dirSize=%d dirOffset=%d\n",
numEntries, dirSize, dirOffset);
mDirectoryMap = new FileMap();
@ -372,7 +372,7 @@ bool ZipFileRO::parseZipArchive(void)
goto bail;
}
}
LOGV("+++ zip good scan %d entries\n", numEntries);
ALOGV("+++ zip good scan %d entries\n", numEntries);
result = true;
bail:

4
libs/utils/ZipUtils.cpp
View File

@ -95,7 +95,7 @@ using namespace android;
if (zstream.avail_in == 0) {
getSize = (compRemaining > kReadBufSize) ?
kReadBufSize : compRemaining;
LOGV("+++ reading %ld bytes (%ld left)\n",
ALOGV("+++ reading %ld bytes (%ld left)\n",
getSize, compRemaining);
int cc = read(fd, readBuf, getSize);
@ -207,7 +207,7 @@ bail:
if (zstream.avail_in == 0) {
getSize = (compRemaining > kReadBufSize) ?
kReadBufSize : compRemaining;
LOGV("+++ reading %ld bytes (%ld left)\n",
ALOGV("+++ reading %ld bytes (%ld left)\n",
getSize, compRemaining);
int cc = fread(readBuf, 1, getSize, fp);