From b1e651a3ce32901ee19f2966d343987c82476b10 Mon Sep 17 00:00:00 2001 From: "rvargas@google.com" Date: Thu, 30 Sep 2010 22:11:18 +0000 Subject: Disk Cache: Add a quick return path for truncating an empty stream and make sure that Flush() doesn't fail when it has nothing to do. BUG=56872, 57395 TEST=none Review URL: http://codereview.chromium.org/3551005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61124 0039d316-1c4b-4281-b951-d872f2087c98 --- net/disk_cache/entry_impl.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'net/disk_cache') diff --git a/net/disk_cache/entry_impl.cc b/net/disk_cache/entry_impl.cc index 0655b28..24796ea 100644 --- a/net/disk_cache/entry_impl.cc +++ b/net/disk_cache/entry_impl.cc @@ -593,8 +593,10 @@ int EntryImpl::WriteDataImpl(int index, int offset, net::IOBuffer* buf, } Addr address(entry_.Data()->data_addr[index]); - if (truncate && offset + buf_len == 0) { - DCHECK(!address.is_initialized()); + if (offset + buf_len == 0) { + if (truncate) { + DCHECK(!address.is_initialized()); + } return 0; } @@ -1010,6 +1012,9 @@ bool EntryImpl::PrepareTarget(int index, int offset, int buf_len, if (truncate) return HandleTruncation(index, offset, buf_len); + if (!offset && !buf_len) + return true; + Addr address(entry_.Data()->data_addr[index]); if (address.is_initialized()) { if (address.is_block_file() && !MoveToLocalBuffer(index)) @@ -1169,7 +1174,7 @@ bool EntryImpl::Flush(int index, int min_len) { DCHECK(!address.is_initialized() || address.is_separate_file()); int size = std::max(entry_.Data()->data_size[index], min_len); - if (!address.is_initialized() && !CreateDataBlock(index, size)) + if (size && !address.is_initialized() && !CreateDataBlock(index, size)) return false; if (!entry_.Data()->data_size[index]) { -- cgit v1.1