base::Bind: Convert Socket::Read.

jingle/glue/channel_socket_adapter.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 "jingle/glue/channel_socket_adapter.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "third_party/libjingle/source/talk/p2p/base/transportchannel.h"
 
 namespace jingle_glue {
 
 TransportChannelSocketAdapter::TransportChannelSocketAdapter(
     cricket::TransportChannel* channel)
     : message_loop_(MessageLoop::current()),
       channel_(channel),
-      read_callback_(NULL),
+      old_read_callback_(NULL),
       write_callback_(NULL),
       closed_error_code_(net::OK) {
   DCHECK(channel_);
 
   channel_->SignalReadPacket.connect(
       this, &TransportChannelSocketAdapter::OnNewPacket);
   channel_->SignalWritableState.connect(
       this, &TransportChannelSocketAdapter::OnWritableState);
   channel_->SignalDestroyed.connect(
       this, &TransportChannelSocketAdapter::OnChannelDestroyed);
 }
 
 TransportChannelSocketAdapter::~TransportChannelSocketAdapter() {
 }
 
 int TransportChannelSocketAdapter::Read(
     net::IOBuffer* buf, int buffer_size, net::OldCompletionCallback* callback) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK(buf);
   DCHECK(callback);
-  CHECK(!read_callback_);
+  CHECK(!old_read_callback_);

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

make same as line 61

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

Done.

 
   if (!channel_) {
     DCHECK(closed_error_code_ != net::OK);
+    return closed_error_code_;
+  }
+
+  old_read_callback_ = callback;
+  read_buffer_ = buf;
+  read_buffer_size_ = buffer_size;
+
+  return net::ERR_IO_PENDING;
+}
+int TransportChannelSocketAdapter::Read(
+    net::IOBuffer* buf, int buffer_size,
+    const net::CompletionCallback& callback) {
+  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK(buf);
+  DCHECK(!callback.is_null());
+  CHECK(!old_read_callback_ && read_callback_.is_null());

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

Do we want this to be a CHECK instead of DCHECK?  I only bring this up because
in most other instances, this is a DCHECK

[csilv, 2011/12/07 00:06:42]

You can probably disregard this as we do use CHECK for this test in other
cases... (but its a bit of both.)

+
+  if (!channel_) {
+    DCHECK(closed_error_code_ != net::OK);
     return closed_error_code_;
   }
 
   read_callback_ = callback;
   read_buffer_ = buf;
   read_buffer_size_ = buffer_size;
 
   return net::ERR_IO_PENDING;
 }
 
@@ skipping 47 matching lines @@
 
   if (!channel_)  // Already closed.
     return;
 
   DCHECK(error_code != net::OK);
   closed_error_code_ = error_code;
   channel_->SignalReadPacket.disconnect(this);
   channel_->SignalDestroyed.disconnect(this);
   channel_ = NULL;
 
-  if (read_callback_) {
-    net::OldCompletionCallback* callback = read_callback_;
-    read_callback_ = NULL;
+  if (old_read_callback_) {
+    net::OldCompletionCallback* callback = old_read_callback_;
+    old_read_callback_ = NULL;
     read_buffer_ = NULL;
     callback->Run(error_code);
+  } else if (read_callback_.is_null()) {

[James Hawkins, 2011/12/06 23:44:23]

This should be else if (!read_callback_.is_null()).

[James Hawkins, 2011/12/06 23:45:04]

Done.

+    net::CompletionCallback callback = read_callback_;
+    read_callback_.Reset();
+    read_buffer_ = NULL;
+    callback.Run(error_code);
   }
 
   if (write_callback_) {
     net::OldCompletionCallback* callback = write_callback_;
     write_callback_ = NULL;
     write_buffer_ = NULL;
     callback->Run(error_code);
   }
 }
 
 void TransportChannelSocketAdapter::OnNewPacket(
     cricket::TransportChannel* channel, const char* data, size_t data_size) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK_EQ(channel, channel_);
-  if (read_callback_) {
+  if (old_read_callback_ || !read_callback_.is_null()) {
     DCHECK(read_buffer_);
     CHECK_LT(data_size, static_cast<size_t>(std::numeric_limits<int>::max()));
 
     if (read_buffer_size_ < static_cast<int>(data_size)) {
       LOG(WARNING) << "Data buffer is smaller than the received packet. "
                    << "Dropping the data that doesn't fit.";
       data_size = read_buffer_size_;
     }
 
     memcpy(read_buffer_->data(), data, data_size);
 
-    net::OldCompletionCallback* callback = read_callback_;
-    read_callback_ = NULL;
-    read_buffer_ = NULL;
-
-    callback->Run(data_size);
+    if (old_read_callback_) {
+      net::OldCompletionCallback* callback = old_read_callback_;
+      old_read_callback_ = NULL;
+      read_buffer_ = NULL;
+      callback->Run(data_size);
+    } else {
+      net::CompletionCallback callback = read_callback_;
+      read_callback_.Reset();
+      read_buffer_ = NULL;
+      callback.Run(data_size);
+    }
   } else {
     LOG(WARNING)
         << "Data was received without a callback. Dropping the packet.";
   }
 }
 
 void TransportChannelSocketAdapter::OnWritableState(
     cricket::TransportChannel* channel) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   // Try to send the packet if there is a pending write.
@@ skipping 13 matching lines @@
 }
 
 void TransportChannelSocketAdapter::OnChannelDestroyed(
     cricket::TransportChannel* channel) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK_EQ(channel, channel_);
   Close(net::ERR_CONNECTION_ABORTED);
 }
 
 }  // namespace jingle_glue