Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Unified Diff: net/disk_cache/simple/simple_entry_impl.h

Issue 22859060: Fix race condition for non-open/create operations happening after a doom. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/disk_cache/entry_unittest.cc ('k') | net/disk_cache/simple/simple_entry_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/disk_cache/simple/simple_entry_impl.h
diff --git a/net/disk_cache/simple/simple_entry_impl.h b/net/disk_cache/simple/simple_entry_impl.h
index 8933d9634fa2a7d44df20ef1c764d33200ceb9b2..544559480588c9f4d42cd6da1f0f2eccc5cbc2eb 100644
--- a/net/disk_cache/simple/simple_entry_impl.h
+++ b/net/disk_cache/simple/simple_entry_impl.h
@@ -179,6 +179,8 @@ class SimpleEntryImpl : public Entry, public base::RefCounted<SimpleEntryImpl>,
const CompletionCallback& callback,
bool truncate);
+ void DoomEntryInternal(const CompletionCallback& callback);
+
// Called after a SimpleSynchronousEntry has completed CreateEntry() or
// OpenEntry(). If |in_sync_entry| is non-NULL, creation is successful and we
// can return |this| SimpleEntryImpl to |*out_entry|. Runs
@@ -216,6 +218,11 @@ class SimpleEntryImpl : public Entry, public base::RefCounted<SimpleEntryImpl>,
scoped_ptr<SimpleEntryStat> entry_stat,
scoped_ptr<int> result);
+ // Called after an asynchronous doom completes.
+ void DoomOperationComplete(const CompletionCallback& callback,
+ State state_to_restore,
+ int result);
+
// Called after validating the checksums on an entry. Passes through the
// original result if successful, propogates the error if the checksum does
// not validate.
@@ -277,8 +284,11 @@ class SimpleEntryImpl : public Entry, public base::RefCounted<SimpleEntryImpl>,
CheckCrcResult crc_check_state_[kSimpleEntryFileCount];
// The |synchronous_entry_| is the worker thread object that performs IO on
- // entries. It's owned by this SimpleEntryImpl whenever |operation_running_|
- // is false (i.e. when an operation is not pending on the worker pool).
+ // entries. It's owned by this SimpleEntryImpl whenever |executing_operation_|
+ // is false (i.e. when an operation is not pending on the worker pool). When
+ // an operation is being executed no one owns the synchronous entry. Therefore
+ // SimpleEntryImpl should not be deleted while an operation is running as that
+ // would leak the SimpleSynchronousEntry.
SimpleSynchronousEntry* synchronous_entry_;
std::queue<SimpleEntryOperation> pending_operations_;
« no previous file with comments | « net/disk_cache/entry_unittest.cc ('k') | net/disk_cache/simple/simple_entry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698