base::Bind: Convert Socket::Read.

net/socket/tcp_client_socket_win.cc

 // Copyright (c) 2011 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/socket/tcp_client_socket_win.h"
 
 #include <mstcpip.h>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 691 matching lines @@
 base::TimeDelta TCPClientSocketWin::GetConnectTimeMicros() const {
   return connect_time_micros_;
 }
 
 int TCPClientSocketWin::Read(IOBuffer* buf,
                              int buf_len,
                              OldCompletionCallback* callback) {
   DCHECK(CalledOnValidThread());
   DCHECK_NE(socket_, INVALID_SOCKET);
   DCHECK(!waiting_read_);
   DCHECK(!old_read_callback_);

[csilv, 2011/12/07 00:03:48]

change to match line 753

[James Hawkins, 2011/12/07 00:19:37]

Done.

   DCHECK(!core_->read_iobuffer_);
 
   buf_len = core_->ThrottleReadSize(buf_len);
 
   core_->read_buffer_.len = buf_len;
   core_->read_buffer_.buf = buf->data();
 
   // TODO(wtc): Remove the assertion after enough testing.
   AssertEventNotSignaled(core_->read_overlapped_.hEvent);
   DWORD num, flags = 0;
@@ skipping 14 matching lines @@
     int os_error = WSAGetLastError();
     if (os_error != WSA_IO_PENDING)
       return MapSystemError(os_error);
   }
   core_->WatchForRead();
   waiting_read_ = true;
   old_read_callback_ = callback;
   core_->read_iobuffer_ = buf;
   return ERR_IO_PENDING;
 }
+int TCPClientSocketWin::Read(IOBuffer* buf,
+                             int buf_len,
+                             const CompletionCallback& callback) {
+  DCHECK(CalledOnValidThread());
+  DCHECK_NE(socket_, INVALID_SOCKET);
+  DCHECK(!waiting_read_);
+  DCHECK(!old_read_callback_ && read_callback_.is_null());
+  DCHECK(!core_->read_iobuffer_);
+
+  buf_len = core_->ThrottleReadSize(buf_len);
+
+  core_->read_buffer_.len = buf_len;
+  core_->read_buffer_.buf = buf->data();
+
+  // TODO(wtc): Remove the assertion after enough testing.
+  AssertEventNotSignaled(core_->read_overlapped_.hEvent);
+  DWORD num, flags = 0;
+  int rv = WSARecv(socket_, &core_->read_buffer_, 1, &num, &flags,
+                   &core_->read_overlapped_, NULL);
+  if (rv == 0) {
+    if (ResetEventIfSignaled(core_->read_overlapped_.hEvent)) {
+      base::StatsCounter read_bytes("tcp.read_bytes");
+      read_bytes.Add(num);
+      num_bytes_read_ += num;
+      if (num > 0)
+        use_history_.set_was_used_to_convey_data();
+      net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_RECEIVED, num,
+                                    core_->read_buffer_.buf);
+      return static_cast<int>(num);
+    }
+  } else {
+    int os_error = WSAGetLastError();
+    if (os_error != WSA_IO_PENDING)
+      return MapSystemError(os_error);
+  }
+  core_->WatchForRead();
+  waiting_read_ = true;
+  old_read_callback_ = callback;

[csilv, 2011/12/07 00:03:48]

read_callback_ = callback;

[James Hawkins, 2011/12/07 00:19:37]

Done.

+  core_->read_iobuffer_ = buf;
+  return ERR_IO_PENDING;
+}
 
 int TCPClientSocketWin::Write(IOBuffer* buf,
                               int buf_len,
                               OldCompletionCallback* callback) {
   DCHECK(CalledOnValidThread());
   DCHECK_NE(socket_, INVALID_SOCKET);
   DCHECK(!waiting_write_);
   DCHECK(!write_callback_);
   DCHECK_GT(buf_len, 0);
   DCHECK(!core_->write_iobuffer_);
@@ skipping 182 matching lines @@
         use_history_.set_was_used_to_convey_data();
       net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_SENT, num_bytes,
                                     core_->write_buffer_.buf);
     }
   }
   core_->write_iobuffer_ = NULL;
   DoWriteCallback(rv);
 }
 
 }  // namespace net