Coalesce small buffers in net::BidirectionalStream

net/spdy/bidirectional_stream_spdy_impl.cc

 // Copyright 2015 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/spdy/bidirectional_stream_spdy_impl.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/time/time.h"
@@ skipping 20 matching lines @@
     : spdy_session_(spdy_session),
       request_info_(nullptr),
       delegate_(nullptr),
       negotiated_protocol_(kProtoUnknown),
       more_read_data_pending_(false),
       read_buffer_len_(0),
       stream_closed_(false),
       closed_stream_status_(ERR_FAILED),
       closed_stream_received_bytes_(0),
       closed_stream_sent_bytes_(0),
+      disable_auto_flush_(false),
       weak_factory_(this) {}
 
 BidirectionalStreamSpdyImpl::~BidirectionalStreamSpdyImpl() {
   if (stream_) {
     stream_->DetachDelegate();
     DCHECK(!stream_);
   }
 }
 
 void BidirectionalStreamSpdyImpl::Start(
     const BidirectionalStreamRequestInfo* request_info,
     const BoundNetLog& net_log,
+    bool disable_auto_flush,
     BidirectionalStreamImpl::Delegate* delegate,
     std::unique_ptr<base::Timer> timer) {
   DCHECK(!stream_);
   DCHECK(timer);
 
+  disable_auto_flush_ = disable_auto_flush;
   delegate_ = delegate;
   timer_ = std::move(timer);
 
   if (!spdy_session_) {
     delegate_->OnFailed(ERR_CONNECTION_CLOSED);
     return;
   }
 
   request_info_ = request_info;
 
@@ skipping 25 matching lines @@
   read_buffer_ = buf;
   read_buffer_len_ = buf_len;
   return ERR_IO_PENDING;
 }
 
 void BidirectionalStreamSpdyImpl::SendData(IOBuffer* data,
                                            int length,
                                            bool end_stream) {
   DCHECK(!stream_closed_);
   DCHECK(stream_);
+  DCHECK(!disable_auto_flush_);
 
   stream_->SendData(data, length,
                     end_stream ? NO_MORE_DATA_TO_SEND : MORE_DATA_TO_SEND);
 }
 
+void BidirectionalStreamSpdyImpl::SendvData(
+    const std::vector<IOBuffer*>& buffers,
+    const std::vector<int>& lengths,
+    bool end_stream) {
+  DCHECK(!stream_closed_);
+  DCHECK(stream_);
+  DCHECK(disable_auto_flush_);
+  DCHECK_EQ(buffers.size(), lengths.size());
+
+  int total_len = 0;
+  for (int len : lengths) {
+    total_len += len;
+  }
+
+  pending_combined_buffer_ = new net::IOBuffer(total_len);
+  int len = 0;
+  // TODO(xunjieli): Get rid of extra copy. Coalesce headers and data frames.
+  for (size_t i = 0; i < buffers.size(); ++i) {
+    memcpy(pending_combined_buffer_->data() + len, buffers[i]->data(),
+           lengths[i]);
+    len += lengths[i];
+  }
+  stream_->SendData(pending_combined_buffer_.get(), total_len,
+                    end_stream ? NO_MORE_DATA_TO_SEND : MORE_DATA_TO_SEND);
+}
+
 void BidirectionalStreamSpdyImpl::Cancel() {
   if (!stream_)
     return;
   // Cancels the stream and detaches the delegate so it doesn't get called back.
   stream_->DetachDelegate();
   DCHECK(!stream_);
 }
 
 NextProto BidirectionalStreamSpdyImpl::GetProtocol() const {
   return negotiated_protocol_;
@@ skipping 16 matching lines @@
   if (!stream_)
     return 0;
 
   return stream_->raw_sent_bytes();
 }
 
 void BidirectionalStreamSpdyImpl::OnRequestHeadersSent() {
   DCHECK(stream_);
 
   negotiated_protocol_ = stream_->GetProtocol();
-  delegate_->OnHeadersSent();
 }
 
 SpdyResponseHeadersStatus BidirectionalStreamSpdyImpl::OnResponseHeadersUpdated(
     const SpdyHeaderBlock& response_headers) {
   DCHECK(stream_);
 
   delegate_->OnHeadersReceived(response_headers);
   return RESPONSE_HEADERS_ARE_COMPLETE;
 }
 
@@ skipping 14 matching lines @@
     // Handing small chunks of data to the caller creates measurable overhead.
     // So buffer data in short time-spans and send a single read notification.
     ScheduleBufferedRead();
   }
 }
 
 void BidirectionalStreamSpdyImpl::OnDataSent() {
   DCHECK(stream_);
   DCHECK(!stream_closed_);
 
+  if (disable_auto_flush_) {
+    DCHECK(pending_combined_buffer_);
+    pending_combined_buffer_ = nullptr;
+  }
   delegate_->OnDataSent();
 }
 
 void BidirectionalStreamSpdyImpl::OnTrailers(const SpdyHeaderBlock& trailers) {
   DCHECK(stream_);
   DCHECK(!stream_closed_);
 
   delegate_->OnTrailersReceived(trailers);
 }
 
@@ skipping 32 matching lines @@
                                   ? NO_MORE_DATA_TO_SEND
                                   : MORE_DATA_TO_SEND);
 }
 
 void BidirectionalStreamSpdyImpl::OnStreamInitialized(int rv) {
   DCHECK_NE(ERR_IO_PENDING, rv);
   if (rv == OK) {
     stream_ = stream_request_.ReleaseStream();
     stream_->SetDelegate(this);
     SendRequestHeaders();
+    delegate_->OnStreamReady();
     return;
   }
   delegate_->OnFailed(rv);
 }
 
 void BidirectionalStreamSpdyImpl::ScheduleBufferedRead() {
   // If there is already a scheduled DoBufferedRead, don't issue
   // another one. Mark that we have received more data and return.
   if (timer_->IsRunning()) {
     more_read_data_pending_ = true;
@@ skipping 31 matching lines @@
 
 bool BidirectionalStreamSpdyImpl::ShouldWaitForMoreBufferedData() const {
   if (stream_closed_)
     return false;
   DCHECK_GT(read_buffer_len_, 0);
   return read_data_queue_.GetTotalSize() <
          static_cast<size_t>(read_buffer_len_);
 }
 
 }  // namespace net