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

Unified Diff: net/base/file_stream_context_win.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/base/file_stream_context.cc ('k') | net/base/mime_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/file_stream_context_win.cc
diff --git a/net/base/file_stream_context_win.cc b/net/base/file_stream_context_win.cc
index d225ee33a7604887b00963578233271df24191d3..a41a74c431e672539494390947e8444574f835d7 100644
--- a/net/base/file_stream_context_win.cc
+++ b/net/base/file_stream_context_win.cc
@@ -11,7 +11,6 @@
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/task_runner.h"
#include "base/threading/worker_pool.h"
#include "net/base/io_buffer.h"
@@ -41,7 +40,10 @@ FileStream::Context::Context(const scoped_refptr<base::TaskRunner>& task_runner)
async_in_progress_(false),
orphaned_(false),
task_runner_(task_runner),
- weak_ptr_factory_(this) {
+ async_read_initiated_(false),
+ async_read_completed_(false),
+ io_complete_for_read_received_(false),
+ result_(0) {
io_context_.handler = this;
memset(&io_context_.overlapped, 0, sizeof(io_context_.overlapped));
}
@@ -53,7 +55,10 @@ FileStream::Context::Context(base::File file,
async_in_progress_(false),
orphaned_(false),
task_runner_(task_runner),
- weak_ptr_factory_(this) {
+ async_read_initiated_(false),
+ async_read_completed_(false),
+ io_complete_for_read_received_(false),
+ result_(0) {
io_context_.handler = this;
memset(&io_context_.overlapped, 0, sizeof(io_context_.overlapped));
if (file_.IsValid()) {
@@ -68,28 +73,32 @@ FileStream::Context::~Context() {
int FileStream::Context::Read(IOBuffer* buf,
int buf_len,
const CompletionCallback& callback) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("423948 FileStream::Context::Read"));
-
- DCHECK(!async_in_progress_);
+ CHECK(!async_in_progress_);
+ DCHECK(!async_read_initiated_);
+ DCHECK(!async_read_completed_);
+ DCHECK(!io_complete_for_read_received_);
IOCompletionIsPending(callback, buf);
- base::WorkerPool::PostTask(
- FROM_HERE,
- base::Bind(&FileStream::Context::ReadAsync,
- weak_ptr_factory_.GetWeakPtr(), file_.GetPlatformFile(),
- make_scoped_refptr(buf), buf_len, &io_context_.overlapped,
- base::MessageLoop::current()->message_loop_proxy()),
- false);
+ async_read_initiated_ = true;
+ result_ = 0;
+ task_runner_->PostTask(
+ FROM_HERE,
+ base::Bind(&FileStream::Context::ReadAsync, base::Unretained(this),
+ file_.GetPlatformFile(), make_scoped_refptr(buf), buf_len,
+ &io_context_.overlapped,
+ base::MessageLoop::current()->message_loop_proxy()));
return ERR_IO_PENDING;
}
int FileStream::Context::Write(IOBuffer* buf,
int buf_len,
const CompletionCallback& callback) {
+ CHECK(!async_in_progress_);
+
+ result_ = 0;
+
DWORD bytes_written = 0;
if (!WriteFile(file_.GetPlatformFile(), buf->data(), buf_len,
&bytes_written, &io_context_.overlapped)) {
@@ -140,58 +149,100 @@ void FileStream::Context::OnIOCompleted(
DCHECK(!callback_.is_null());
DCHECK(async_in_progress_);
- async_in_progress_ = false;
+ if (!async_read_initiated_)
+ async_in_progress_ = false;
+
if (orphaned_) {
- callback_.Reset();
- in_flight_buf_ = NULL;
- CloseAndDelete();
+ io_complete_for_read_received_ = true;
+ // If we are called due to a pending read and the asynchronous read task
+ // has not completed we have to keep the context around until it completes.
+ if (async_read_initiated_ && !async_read_completed_)
+ return;
+ DeleteOrphanedContext();
return;
}
- int result;
if (error == ERROR_HANDLE_EOF) {
- result = 0;
+ result_ = 0;
} else if (error) {
IOResult error_result = IOResult::FromOSError(error);
- result = static_cast<int>(error_result.result);
+ result_ = static_cast<int>(error_result.result);
} else {
- result = bytes_read;
+ if (result_)
+ DCHECK_EQ(result_, static_cast<int>(bytes_read));
+ result_ = bytes_read;
IncrementOffset(&io_context_.overlapped, bytes_read);
}
+ if (async_read_initiated_)
+ io_complete_for_read_received_ = true;
+
+ InvokeUserCallback();
+}
+
+void FileStream::Context::InvokeUserCallback() {
+ // For an asynchonous Read operation don't invoke the user callback until
+ // we receive the IO completion notification and the asynchronous Read
+ // completion notification.
+ if (async_read_initiated_) {
+ if (!io_complete_for_read_received_ || !async_read_completed_)
+ return;
+ async_read_initiated_ = false;
+ io_complete_for_read_received_ = false;
+ async_read_completed_ = false;
+ async_in_progress_ = false;
+ }
CompletionCallback temp_callback = callback_;
callback_.Reset();
scoped_refptr<IOBuffer> temp_buf = in_flight_buf_;
in_flight_buf_ = NULL;
- temp_callback.Run(result);
+ temp_callback.Run(result_);
+}
+
+void FileStream::Context::DeleteOrphanedContext() {
+ async_in_progress_ = false;
+ callback_.Reset();
+ in_flight_buf_ = NULL;
+ CloseAndDelete();
}
// static
void FileStream::Context::ReadAsync(
- const base::WeakPtr<FileStream::Context>& context,
+ FileStream::Context* context,
HANDLE file,
scoped_refptr<net::IOBuffer> buf,
int buf_len,
OVERLAPPED* overlapped,
scoped_refptr<base::MessageLoopProxy> origin_thread_loop) {
DWORD bytes_read = 0;
- if (!ReadFile(file, buf->data(), buf_len, &bytes_read, overlapped)) {
- origin_thread_loop->PostTask(
- FROM_HERE, base::Bind(&FileStream::Context::ReadAsyncResult, context,
- ::GetLastError()));
- }
+ BOOL ret = ::ReadFile(file, buf->data(), buf_len, &bytes_read, overlapped);
+ origin_thread_loop->PostTask(
+ FROM_HERE,
+ base::Bind(&FileStream::Context::ReadAsyncResult,
+ base::Unretained(context), ret, bytes_read, ::GetLastError()));
}
-void FileStream::Context::ReadAsyncResult(DWORD os_error) {
+void FileStream::Context::ReadAsyncResult(BOOL read_file_ret,
+ DWORD bytes_read,
+ DWORD os_error) {
+ // If the context is orphaned and we already received the io completion
+ // notification then we should delete the context and get out.
+ if (orphaned_ && io_complete_for_read_received_) {
+ DeleteOrphanedContext();
+ return;
+ }
+
+ async_read_completed_ = true;
+ if (read_file_ret) {
+ result_ = bytes_read;
+ InvokeUserCallback();
+ return;
+ }
+
IOResult error = IOResult::FromOSError(os_error);
- if (error.os_error == ERROR_HANDLE_EOF) {
- // Report EOF by returning 0 bytes read.
- OnIOCompleted(&io_context_, 0, error.os_error);
- } else if (error.os_error != ERROR_IO_PENDING) {
- // We don't need to inform the caller about ERROR_PENDING_IO as that was
- // already done when the ReadFile call was queued to the worker pool.
- if (error.os_error)
- LOG(WARNING) << "ReadFile failed: " << error.os_error;
+ if (error.os_error == ERROR_IO_PENDING) {
+ InvokeUserCallback();
+ } else {
OnIOCompleted(&io_context_, 0, error.os_error);
}
}
« no previous file with comments | « net/base/file_stream_context.cc ('k') | net/base/mime_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698