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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/file_stream_win.cc

Issue 9402014: net: FileStream::Read/Write() to take IOBuffer* instead of char* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 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
« net/base/file_stream.h ('K') | « net/base/file_stream_unittest.cc ('k') | net/base/mock_file_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/file_stream_win.cc
diff --git a/net/base/file_stream_win.cc b/net/base/file_stream_win.cc
index e111733d3f33e145c7eabae395635e77adbd57a4..862dcf35158958bcc51cb9a5f41429b3d09564c1 100644
--- a/net/base/file_stream_win.cc
+++ b/net/base/file_stream_win.cc
@@ -13,6 +13,7 @@
#include "base/threading/thread_restrictions.h"
#include "net/base/file_stream_metrics.h"
#include "net/base/file_stream_net_log_parameters.h"
+#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
namespace net {
@@ -69,7 +70,8 @@ class FileStream::AsyncContext : public MessageLoopForIO::IOHandler {
}
~AsyncContext();
- void IOCompletionIsPending(const CompletionCallback& callback);
+ void IOCompletionIsPending(const CompletionCallback& callback,
+ IOBuffer* buf);
OVERLAPPED* overlapped() { return &context_.overlapped; }
const CompletionCallback& callback() const { return callback_; }
@@ -86,6 +88,7 @@ class FileStream::AsyncContext : public MessageLoopForIO::IOHandler {
MessageLoopForIO::IOContext context_;
CompletionCallback callback_;
+ scoped_refptr<IOBuffer> in_flight_buf_;
bool is_closing_;
bool record_uma_;
const net::BoundNetLog bound_net_log_;
@@ -108,9 +111,11 @@ FileStream::AsyncContext::~AsyncContext() {
}
void FileStream::AsyncContext::IOCompletionIsPending(
- const CompletionCallback& callback) {
+ const CompletionCallback& callback,
+ IOBuffer* buf) {
DCHECK(callback_.is_null());
callback_ = callback;
+ in_flight_buf_ = buf; // Hold until the async operation ends.
}
void FileStream::AsyncContext::OnIOCompleted(
@@ -120,6 +125,7 @@ void FileStream::AsyncContext::OnIOCompleted(
if (is_closing_) {
callback_.Reset();
+ in_flight_buf_ = NULL;
return;
}
@@ -132,9 +138,11 @@ void FileStream::AsyncContext::OnIOCompleted(
if (bytes_read)
IncrementOffset(&context->overlapped, bytes_read);
- CompletionCallback temp;
- std::swap(temp, callback_);
- temp.Run(result);
+ CompletionCallback temp_callback = callback_;
+ callback_.Reset();
+ scoped_refptr<IOBuffer> temp_buf = in_flight_buf_;
+ in_flight_buf_ = NULL;
+ temp_callback.Run(result);
}
// FileStream ------------------------------------------------------------
@@ -277,41 +285,27 @@ int64 FileStream::Available() {
}
int FileStream::Read(
- char* buf, int buf_len, const CompletionCallback& callback) {
+ IOBuffer* buf, int buf_len, const CompletionCallback& callback) {
DCHECK(async_context_.get());
- return ReadInternal(buf, buf_len, callback);
-}
-
-int FileStream::ReadSync(char* buf, int buf_len) {
- DCHECK(!async_context_.get());
- return ReadInternal(buf, buf_len, CompletionCallback());
-}
-int FileStream::ReadInternal(
- char* buf, int buf_len, const CompletionCallback& callback) {
if (!IsOpen())
return ERR_UNEXPECTED;
DCHECK(open_flags_ & base::PLATFORM_FILE_READ);
OVERLAPPED* overlapped = NULL;
- if (async_context_.get()) {
- DCHECK(!callback.is_null());
- DCHECK(async_context_->callback().is_null());
- overlapped = async_context_->overlapped();
- async_context_->set_error_source(FILE_ERROR_SOURCE_READ);
- } else {
- DCHECK(callback.is_null());
- base::ThreadRestrictions::AssertIOAllowed();
- }
+ DCHECK(!callback.is_null());
+ DCHECK(async_context_->callback().is_null());
+ overlapped = async_context_->overlapped();
+ async_context_->set_error_source(FILE_ERROR_SOURCE_READ);
- int rv;
+ int rv = 0;
DWORD bytes_read;
- if (!ReadFile(file_, buf, buf_len, &bytes_read, overlapped)) {
+ if (!ReadFile(file_, buf->data(), buf_len, &bytes_read, overlapped)) {
DWORD error = GetLastError();
- if (async_context_.get() && error == ERROR_IO_PENDING) {
- async_context_->IOCompletionIsPending(callback);
+ if (error == ERROR_IO_PENDING) {
+ async_context_->IOCompletionIsPending(callback, buf);
rv = ERR_IO_PENDING;
} else if (error == ERROR_HANDLE_EOF) {
rv = 0; // Report EOF by returning 0 bytes read.
@@ -323,7 +317,7 @@ int FileStream::ReadInternal(
bound_net_log_);
}
} else if (overlapped) {
- async_context_->IOCompletionIsPending(callback);
+ async_context_->IOCompletionIsPending(callback, buf);
rv = ERR_IO_PENDING;
} else {
rv = static_cast<int>(bytes_read);
@@ -331,6 +325,36 @@ int FileStream::ReadInternal(
return rv;
}
+int FileStream::ReadSync(char* buf, int buf_len) {
+ DCHECK(!async_context_.get());
+
+ if (!IsOpen())
+ return ERR_UNEXPECTED;
+
+ DCHECK(open_flags_ & base::PLATFORM_FILE_READ);
+
+ base::ThreadRestrictions::AssertIOAllowed();
willchan no longer on Chromium 2012/02/15 23:37:49 Can this move up higher?
satorux1 2012/02/16 00:11:57 Done.
+
+ int rv = 0;
+
+ DWORD bytes_read;
+ if (!ReadFile(file_, buf, buf_len, &bytes_read, NULL)) {
+ DWORD error = GetLastError();
+ if (error == ERROR_HANDLE_EOF) {
+ rv = 0; // Report EOF by returning 0 bytes read.
+ } else {
+ LOG(WARNING) << "ReadFile failed: " << error;
+ rv = RecordAndMapError(error,
+ FILE_ERROR_SOURCE_READ,
+ record_uma_,
+ bound_net_log_);
+ }
+ } else {
+ rv = static_cast<int>(bytes_read);
+ }
+ return rv;
+}
+
int FileStream::ReadUntilComplete(char *buf, int buf_len) {
int to_read = buf_len;
int bytes_total = 0;
@@ -353,41 +377,26 @@ int FileStream::ReadUntilComplete(char *buf, int buf_len) {
}
int FileStream::Write(
- const char* buf, int buf_len, const CompletionCallback& callback) {
+ IOBuffer* buf, int buf_len, const CompletionCallback& callback) {
DCHECK(async_context_.get());
- return WriteInternal(buf, buf_len, callback);
-}
-
-int FileStream::WriteSync(
- const char* buf, int buf_len) {
- DCHECK(!async_context_.get());
- return WriteInternal(buf, buf_len, CompletionCallback());
-}
-int FileStream::WriteInternal(
- const char* buf, int buf_len, const CompletionCallback& callback) {
if (!IsOpen())
return ERR_UNEXPECTED;
DCHECK(open_flags_ & base::PLATFORM_FILE_WRITE);
OVERLAPPED* overlapped = NULL;
- if (async_context_.get()) {
- DCHECK(!callback.is_null());
- DCHECK(async_context_->callback().is_null());
- overlapped = async_context_->overlapped();
- async_context_->set_error_source(FILE_ERROR_SOURCE_WRITE);
- } else {
- DCHECK(callback.is_null());
- base::ThreadRestrictions::AssertIOAllowed();
- }
-
- int rv;
- DWORD bytes_written;
- if (!WriteFile(file_, buf, buf_len, &bytes_written, overlapped)) {
+ DCHECK(!callback.is_null());
+ DCHECK(async_context_->callback().is_null());
+ overlapped = async_context_->overlapped();
+ async_context_->set_error_source(FILE_ERROR_SOURCE_WRITE);
+
+ int rv = 0;
+ DWORD bytes_written = 0;
+ if (!WriteFile(file_, buf->data(), buf_len, &bytes_written, overlapped)) {
DWORD error = GetLastError();
- if (async_context_.get() && error == ERROR_IO_PENDING) {
- async_context_->IOCompletionIsPending(callback);
+ if (error == ERROR_IO_PENDING) {
+ async_context_->IOCompletionIsPending(callback, buf);
rv = ERR_IO_PENDING;
} else {
LOG(WARNING) << "WriteFile failed: " << error;
@@ -397,7 +406,7 @@ int FileStream::WriteInternal(
bound_net_log_);
}
} else if (overlapped) {
- async_context_->IOCompletionIsPending(callback);
+ async_context_->IOCompletionIsPending(callback, buf);
rv = ERR_IO_PENDING;
} else {
rv = static_cast<int>(bytes_written);
@@ -405,6 +414,32 @@ int FileStream::WriteInternal(
return rv;
}
+int FileStream::WriteSync(
+ const char* buf, int buf_len) {
+ DCHECK(!async_context_.get());
+
+ if (!IsOpen())
+ return ERR_UNEXPECTED;
+
+ DCHECK(open_flags_ & base::PLATFORM_FILE_WRITE);
+
+ base::ThreadRestrictions::AssertIOAllowed();
willchan no longer on Chromium 2012/02/15 23:37:49 This too.
satorux1 2012/02/16 00:11:57 Done.
+
+ int rv = 0;
+ DWORD bytes_written = 0;
+ if (!WriteFile(file_, buf, buf_len, &bytes_written, NULL)) {
+ DWORD error = GetLastError();
+ LOG(WARNING) << "WriteFile failed: " << error;
+ rv = RecordAndMapError(error,
+ FILE_ERROR_SOURCE_WRITE,
+ record_uma_,
+ bound_net_log_);
+ } else {
+ rv = static_cast<int>(bytes_written);
+ }
+ return rv;
+}
+
int FileStream::Flush() {
base::ThreadRestrictions::AssertIOAllowed();
« net/base/file_stream.h ('K') | « net/base/file_stream_unittest.cc ('k') | net/base/mock_file_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698