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

Bug 1025913 - Let memory-only HTTP cache entries doom disk entries, CacheEntry.mUseDisk immutable, r=michal

Browse Source
This commit is contained in:
Honza Bambas
2014-06-25 18:42:50 +02:00
parent 3baff8b464
commit 66a31a5087
6 changed files with 99 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
netwerk/cache2/CacheStorageService.cpp
View File

@@ -290,7 +290,7 @@ private:
static_cast<WalkMemoryCacheRunnable*>(aClosure);
// Ignore disk entries
if (aEntry->IsUsingDiskLocked())
if (aEntry->IsUsingDisk())
return PL_DHASH_NEXT;
walker->mSize += aEntry->GetMetadataMemoryConsumption();
@@ -1293,15 +1293,21 @@ CacheStorageService::AddStorageEntry(nsCSubstring const& aContextKey,
if (!sGlobalEntryTables->Get(aContextKey, &entries)) {
entries = new CacheEntryTable(CacheEntryTable::ALL_ENTRIES);
sGlobalEntryTables->Put(aContextKey, entries);
LOG((" new storage entries table for context %s", aContextKey.BeginReading()));
LOG((" new storage entries table for context '%s'", aContextKey.BeginReading()));
}
bool entryExists = entries->Get(entryKey, getter_AddRefs(entry));
// check whether the file is already doomed
if (entryExists && entry->IsFileDoomed() && !aReplace) {
LOG((" file already doomed, replacing the entry"));
aReplace = true;
if (entryExists && !aReplace) {
// check whether the file is already doomed or we want to turn this entry
// to a memory-only.
if (MOZ_UNLIKELY(entry->IsFileDoomed())) {
LOG((" file already doomed, replacing the entry"));
aReplace = true;
} else if (MOZ_UNLIKELY(!aWriteToDisk) && MOZ_LIKELY(entry->IsUsingDisk())) {
LOG((" entry is persistnet but we want mem-only, replacing it"));
aReplace = true;
}
}
// If truncate is demanded, delete and doom the current entry
@@ -1318,10 +1324,6 @@ CacheStorageService::AddStorageEntry(nsCSubstring const& aContextKey,
entryExists = false;
}
if (entryExists && entry->SetUsingDisk(aWriteToDisk)) {
RecordMemoryOnlyEntry(entry, !aWriteToDisk, true /* overwrite */);
}
// Ensure entry for the particular URL, if not read/only
if (!entryExists && (aCreateIfNotExist || aReplace)) {
// Entry is not in the hashtable or has just been truncated...
@@ -1472,17 +1474,17 @@ CacheStorageService::DoomStorageEntry(CacheStorage const* aStorage,
CacheEntryTable* entries;
if (sGlobalEntryTables->Get(contextKey, &entries)) {
if (entries->Get(entryKey, getter_AddRefs(entry))) {
if (aStorage->WriteToDisk() || !entry->IsUsingDiskLocked()) {
if (aStorage->WriteToDisk() || !entry->IsUsingDisk()) {
// When evicting from disk storage, purge
// When evicting from memory storage and the entry is memory-only, purge
LOG((" purging entry %p for %s [storage use disk=%d, entry use disk=%d]",
entry.get(), entryKey.get(), aStorage->WriteToDisk(), entry->IsUsingDiskLocked()));
entry.get(), entryKey.get(), aStorage->WriteToDisk(), entry->IsUsingDisk()));
entries->Remove(entryKey);
}
else {
// Otherwise, leave it
LOG((" leaving entry %p for %s [storage use disk=%d, entry use disk=%d]",
entry.get(), entryKey.get(), aStorage->WriteToDisk(), entry->IsUsingDiskLocked()));
entry.get(), entryKey.get(), aStorage->WriteToDisk(), entry->IsUsingDisk()));
entry = nullptr;
}
}
@@ -1791,7 +1793,7 @@ size_t CollectEntryMemory(nsACString const & aKey,
// Bypass memory-only entries, those will be reported when iterating
// the memory only table. Memory-only entries are stored in both ALL_ENTRIES
// and MEMORY_ONLY hashtables.
if (aTable->Type() == CacheEntryTable::MEMORY_ONLY || aEntry->IsUsingDiskLocked())
if (aTable->Type() == CacheEntryTable::MEMORY_ONLY || aEntry->IsUsingDisk())
n += aEntry->SizeOfIncludingThis(mallocSizeOf);
return n;