net/disk_cache/simple/simple_synchronous_entry.h - Issue 22859060: Fix race condition for non-open/create operations happening after a doom.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/disk_cache/simple/simple_synchronous_entry.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: Address Gavin's and Thomas' comments Created 7 years, 4 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

« net/disk_cache/simple/simple_backend_impl.cc ('K') | « net/disk_cache/simple/simple_entry_operation.cc ('k') | net/disk_cache/simple/simple_synchronous_entry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/disk_cache/simple/simple_synchronous_entry.h

diff --git a/net/disk_cache/simple/simple_synchronous_entry.h b/net/disk_cache/simple/simple_synchronous_entry.h

index f591c9a0f93ef026fcccf139da225b8495f9f369..f1eb57e28800797cddcc17295634ac92f30c3667 100644

--- a/net/disk_cache/simple/simple_synchronous_entry.h

+++ b/net/disk_cache/simple/simple_synchronous_entry.h

@@ -84,12 +84,11 @@ class SimpleSynchronousEntry {

// Deletes an entry without first Opening it. Does not check if there is

// already an Entry object in memory holding the open files. Be careful! This

- // is meant to be used by the Backend::DoomEntry() call. |callback| will be

- // run by |callback_runner|.

- static void DoomEntry(const base::FilePath& path,

+ // is meant to be used by the Backend::DoomEntry() call. Returns a net error

+ // code.

+ static int DoomEntry(const base::FilePath& path,

const std::string& key,

- uint64 entry_hash,

- int* out_result);

+ uint64 entry_hash);

// Like |DoomEntry()| above. Deletes all entries corresponding to the

// |key_hashes|. Succeeds only when all entries are deleted. Returns a net