diff options
author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-01 01:12:00 +0000 |
---|---|---|
committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-01 01:12:00 +0000 |
commit | 05bebf1bc8d96ca3262cd3015af5c8178d3e7f84 (patch) | |
tree | 147efbc0cd0087e277aed96ed01ba6b85a254faf /net/disk_cache/sparse_control.cc | |
parent | 6ebf2fc952b8170971e37971e9d1362c64424e89 (diff) | |
download | chromium_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/sparse_control.cc')
-rw-r--r-- | net/disk_cache/sparse_control.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/disk_cache/sparse_control.cc b/net/disk_cache/sparse_control.cc index 3726db9..2d9d3c1 100644 --- a/net/disk_cache/sparse_control.cc +++ b/net/disk_cache/sparse_control.cc @@ -126,7 +126,7 @@ void ChildrenDeleter::DeleteChildren() { return Release(); } std::string child_name = GenerateChildName(name_, signature_, child_id); - backend_->SyncDoomEntry(child_name); + backend_->DoomEntry(child_name); children_map_.Set(child_id, false); // Post a task to delete the next child. @@ -373,7 +373,7 @@ bool SparseControl::OpenChild() { CloseChild(); } - // See if we are tracking this child. + // Se if we are tracking this child. if (!ChildPresent()) return ContinueWithoutChild(key); @@ -418,7 +418,7 @@ void SparseControl::CloseChild() { NULL, false); if (rv != sizeof(child_data_)) DLOG(ERROR) << "Failed to save child data"; - child_->Release(); + child_->Close(); child_ = NULL; } @@ -430,8 +430,8 @@ std::string SparseControl::GenerateChildKey() { // We are deleting the child because something went wrong. bool SparseControl::KillChildAndContinue(const std::string& key, bool fatal) { SetChildBit(false); - child_->DoomImpl(); - child_->Release(); + child_->Doom(); + child_->Close(); child_ = NULL; if (fatal) { result_ = net::ERR_CACHE_READ_FAILURE; |