corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 604897 - Unable to cache small entries when _CACHE_00[1-3]_ is full; r=mayhemer a=blocking-betaN+

Browse Source
This commit is contained in:
Michal Novotny
2011-01-18 16:12:10 +02:00
parent 5e9b391dbd
commit 23e84528e9
6 changed files with 156 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
netwerk/cache/nsDiskCacheStreams.cpp vendored
View File

@@ -502,11 +502,40 @@ nsDiskCacheStreamIO::Flush()
// write data to cache blocks, or flush mBuffer to file
nsDiskCacheMap *cacheMap = mDevice->CacheMap(); // get map reference
nsresult rv;
if ((mStreamEnd > kMaxBufferSize) ||
(mBinding->mCacheEntry->StoragePolicy() == nsICache::STORE_ON_DISK_AS_FILE)) {
PRBool written = PR_FALSE;
if ((mStreamEnd <= kMaxBufferSize) &&
(mBinding->mCacheEntry->StoragePolicy() != nsICache::STORE_ON_DISK_AS_FILE)) {
// store data (if any) in cache block files
mBufDirty = PR_FALSE;
// delete existing storage
nsDiskCacheRecord * record = &mBinding->mRecord;
if (record->DataLocationInitialized()) {
rv = cacheMap->DeleteStorage(record, nsDiskCache::kData);
if (NS_FAILED(rv)) {
NS_WARNING("cacheMap->DeleteStorage() failed.");
cacheMap->DeleteRecord(record);
return rv;
}
}
// flush buffer to block files
written = PR_TRUE;
if (mStreamEnd > 0) {
rv = cacheMap->WriteDataCacheBlocks(mBinding, mBuffer, mBufEnd);
if (NS_FAILED(rv)) {
NS_WARNING("WriteDataCacheBlocks() failed.");
written = PR_FALSE;
}
}
}
if (!written) {
// make sure we save as separate file
rv = FlushBufferToFile(); // will initialize DataFileLocation() if necessary
rv = FlushBufferToFile(); // initializes DataFileLocation() if necessary
if (mFD) {
// Update the file size of the disk file in the cache
@@ -529,32 +558,6 @@ nsDiskCacheStreamIO::Flush()
// therefore, it's probably not worth optimizing for the subsequent
// write, so we unconditionally delete mBuffer here.
DeleteBuffer();
} else {
// store data (if any) in cache block files
mBufDirty = PR_FALSE;
// delete existing storage
nsDiskCacheRecord * record = &mBinding->mRecord;
if (record->DataLocationInitialized()) {
rv = cacheMap->DeleteStorage(record, nsDiskCache::kData);
if (NS_FAILED(rv)) {
NS_WARNING("cacheMap->DeleteStorage() failed.");
cacheMap->DeleteRecord(record);
return rv;
}
}
// flush buffer to block files
if (mStreamEnd > 0) {
rv = cacheMap->WriteDataCacheBlocks(mBinding, mBuffer, mBufEnd);
if (NS_FAILED(rv)) {
NS_WARNING("WriteDataCacheBlocks() failed.");
nsCacheService::DoomEntry(mBinding->mCacheEntry);
return rv;
}
}
}
// XXX do we need this here? WriteDataCacheBlocks() calls UpdateRecord()