summaryrefslogtreecommitdiffstats
path: root/net/disk_cache/eviction.cc
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-01 01:12:00 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-01 01:12:00 +0000
commit05bebf1bc8d96ca3262cd3015af5c8178d3e7f84 (patch)
tree147efbc0cd0087e277aed96ed01ba6b85a254faf /net/disk_cache/eviction.cc
parent6ebf2fc952b8170971e37971e9d1362c64424e89 (diff)
downloadchromium_src-05bebf1bc8d96ca3262cd3015af5c8178d3e7f84.zip
chromium_src-05bebf1bc8d96ca3262cd3015af5c8178d3e7f84.tar.gz
chromium_src-05bebf1bc8d96ca3262cd3015af5c8178d3e7f84.tar.bz2
Revert 51312 - Disk cache: Switch the disk cache to use the cache_thread.
(tsan errors on the unit tests) Add an InFlightBackendIO class that handles posting of cacheoperations back and forth between the IO thread and the cachethread. BUG=26730 TEST=unit tests Review URL: http://codereview.chromium.org/2829008 TBR=nsylvain@chromium.org Review URL: http://codereview.chromium.org/2819032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache/eviction.cc')
-rw-r--r--net/disk_cache/eviction.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/disk_cache/eviction.cc b/net/disk_cache/eviction.cc
index e2e810a..0122b7a 100644
--- a/net/disk_cache/eviction.cc
+++ b/net/disk_cache/eviction.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -224,7 +224,7 @@ bool Eviction::EvictEntry(CacheRankingsBlock* node, bool empty) {
ReportTrimTimes(entry);
if (empty || !new_eviction_) {
- entry->DoomImpl();
+ entry->Doom();
} else {
entry->DeleteEntryData(false);
EntryStore* info = entry->entry()->Data();
@@ -453,7 +453,7 @@ bool Eviction::RemoveDeletedNode(CacheRankingsBlock* node) {
}
bool doomed = (entry->entry()->Data()->state == ENTRY_DOOMED);
entry->entry()->Data()->state = ENTRY_DOOMED;
- entry->DoomImpl();
+ entry->Doom();
entry->Release();
return !doomed;
}