Disk cache: Extend the internal buffering performed by each entry...

net/disk_cache/file_win.cc

 // 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.
 
 #include "net/disk_cache/file.h"
 
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "net/disk_cache/disk_cache.h"
 
 namespace {
 
 // Structure used for asynchronous operations.
 struct MyOverlapped {
   MyOverlapped(disk_cache::File* file, size_t offset,
                disk_cache::FileIOCallback* callback);
-  ~MyOverlapped();
+  ~MyOverlapped() {}
   OVERLAPPED* overlapped() {
     return &context_.overlapped;
   }
 
   MessageLoopForIO::IOContext context_;
   scoped_refptr<disk_cache::File> file_;
   disk_cache::FileIOCallback* callback_;
-  const void* buffer_;
-  bool delete_buffer_;  // Delete the user buffer at completion.
 };
 
 COMPILE_ASSERT(!offsetof(MyOverlapped, context_), starts_with_overlapped);
 
 // Helper class to handle the IO completion notifications from the message loop.
 class CompletionHandler : public MessageLoopForIO::IOHandler {
   virtual void OnIOCompleted(MessageLoopForIO::IOContext* context,
                              DWORD actual_bytes, DWORD error);
 };
 
@@ skipping 15 matching lines @@
 
 MyOverlapped::MyOverlapped(disk_cache::File* file, size_t offset,
                            disk_cache::FileIOCallback* callback) {
   memset(this, 0, sizeof(*this));
   context_.handler = Singleton<CompletionHandler>::get();
   context_.overlapped.Offset = static_cast<DWORD>(offset);
   file_ = file;
   callback_ = callback;
 }
 
-MyOverlapped::~MyOverlapped() {
-  if (delete_buffer_) {
-    DCHECK(!callback_);
-    // This whole thing could be updated to use IOBuffer, but PostWrite is not
-    // used at the moment. TODO(rvargas): remove or update this code.
-    delete[] reinterpret_cast<const char*>(buffer_);
-  }
-}
-
 }  // namespace
 
 namespace disk_cache {
 
 File::File(base::PlatformFile file)
     : init_(true), mixed_(true), platform_file_(INVALID_HANDLE_VALUE),
       sync_platform_file_(file) {
 }
 
 bool File::Init(const FilePath& name) {
@@ skipping 118 matching lines @@
 
 bool File::Write(const void* buffer, size_t buffer_len, size_t offset,
                  FileIOCallback* callback, bool* completed) {
   DCHECK(init_);
   if (!callback) {
     if (completed)
       *completed = true;
     return Write(buffer, buffer_len, offset);
   }
 
-  return AsyncWrite(buffer, buffer_len, offset, true, callback, completed);
-}
-
-bool File::PostWrite(const void* buffer, size_t buffer_len, size_t offset) {
-  DCHECK(init_);
-  return AsyncWrite(buffer, buffer_len, offset, false, NULL, NULL);
+  return AsyncWrite(buffer, buffer_len, offset, callback, completed);
 }
 
 bool File::AsyncWrite(const void* buffer, size_t buffer_len, size_t offset,
-                      bool notify, FileIOCallback* callback, bool* completed) {
+                      FileIOCallback* callback, bool* completed) {
   DCHECK(init_);
+  DCHECK(callback);
+  DCHECK(completed);
   if (buffer_len > ULONG_MAX || offset > ULONG_MAX)
     return false;
 
   MyOverlapped* data = new MyOverlapped(this, offset, callback);
-  bool dummy_completed;
-  if (!callback) {
-    DCHECK(!notify);
-    data->delete_buffer_ = true;
-    data->buffer_ = buffer;
-    completed = &dummy_completed;
-  }
-
   DWORD size = static_cast<DWORD>(buffer_len);
 
   DWORD actual;
   if (!WriteFile(platform_file_, buffer, size, &actual, data->overlapped())) {
     *completed = false;
     if (GetLastError() == ERROR_IO_PENDING)
       return true;
     delete data;
     return false;
   }
@@ skipping 35 matching lines @@
 void File::WaitForPendingIO(int* num_pending_io) {
   while (*num_pending_io) {
     // Asynchronous IO operations may be in flight and the completion may end
     // up calling us back so let's wait for them.
     MessageLoopForIO::IOHandler* handler = Singleton<CompletionHandler>::get();
     MessageLoopForIO::current()->WaitForIOCompletion(100, handler);
   }
 }
 
 }  // namespace disk_cache