Coalesce small buffers in net::BidirectionalStream

net/http/bidirectional_stream.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/http/bidirectional_stream.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 10 matching lines @@
 #include "net/http/http_stream.h"
 #include "net/spdy/spdy_http_utils.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_config.h"
 #include "url/gurl.h"
 
 namespace net {
 
 BidirectionalStream::Delegate::Delegate() {}
 
+void BidirectionalStream::Delegate::OnStreamReady() {}
+
 BidirectionalStream::Delegate::~Delegate() {}
 
 BidirectionalStream::BidirectionalStream(
     std::unique_ptr<BidirectionalStreamRequestInfo> request_info,
     HttpNetworkSession* session,
+    bool disable_auto_flush,
     Delegate* delegate)
     : BidirectionalStream(std::move(request_info),
                           session,
+                          disable_auto_flush,
                           delegate,
                           base::WrapUnique(new base::Timer(false, false))) {}
 
 BidirectionalStream::BidirectionalStream(
     std::unique_ptr<BidirectionalStreamRequestInfo> request_info,
     HttpNetworkSession* session,
+    bool disable_auto_flush,
     Delegate* delegate,
     std::unique_ptr<base::Timer> timer)
     : request_info_(std::move(request_info)),
       net_log_(BoundNetLog::Make(session->net_log(),
                                  NetLog::SOURCE_BIDIRECTIONAL_STREAM)),
       session_(session),
+      disable_auto_flush_(disable_auto_flush),
       delegate_(delegate),
-      timer_(std::move(timer)),
-      write_buffer_len_(0) {
+      timer_(std::move(timer)) {
   DCHECK(delegate_);
   DCHECK(request_info_);
 
   SSLConfig server_ssl_config;
   session->ssl_config_service()->GetSSLConfig(&server_ssl_config);
   session->GetAlpnProtos(&server_ssl_config.alpn_protos);
   session->GetNpnProtos(&server_ssl_config.npn_protos);
 
   if (!request_info_->url.SchemeIs(url::kHttpsScheme)) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ skipping 33 matching lines @@
     read_buffer_ = buf;
     // Bytes will be logged in OnDataRead().
   }
   return rv;
 }
 
 void BidirectionalStream::SendData(IOBuffer* data,
                                    int length,
                                    bool end_stream) {
   DCHECK(stream_impl_);
+  DCHECK(write_buffer_list_.empty());
+  DCHECK(write_buffer_len_list_.empty());
 
   stream_impl_->SendData(data, length, end_stream);
-  write_buffer_ = data;
-  write_buffer_len_ = length;
+  write_buffer_list_.push_back(data);
+  write_buffer_len_list_.push_back(length);
+}
+
+void BidirectionalStream::SendvData(const std::vector<IOBuffer*>& buffers,
+                                    const std::vector<int>& lengths,
+                                    bool end_stream) {
+  DCHECK(stream_impl_);
+  DCHECK_EQ(buffers.size(), lengths.size());
+  DCHECK(write_buffer_list_.empty());
+  DCHECK(write_buffer_len_list_.empty());
+
+  stream_impl_->SendvData(buffers, lengths, end_stream);
+  for (size_t i = 0; i < buffers.size(); ++i) {
+    write_buffer_list_.push_back(buffers[i]);
+    write_buffer_len_list_.push_back(lengths[i]);
+  }
 }
 
 void BidirectionalStream::Cancel() {
   stream_request_.reset();
   if (stream_impl_) {
     stream_impl_->Cancel();
     stream_impl_.reset();
   }
 }
 
@@ skipping 11 matching lines @@
   return stream_impl_->GetTotalReceivedBytes();
 }
 
 int64_t BidirectionalStream::GetTotalSentBytes() const {
   if (!stream_impl_)
     return 0;
 
   return stream_impl_->GetTotalSentBytes();
 }
 
-void BidirectionalStream::OnHeadersSent() {
-  delegate_->OnHeadersSent();
+void BidirectionalStream::OnStreamReady() {
+  delegate_->OnStreamReady();
 }
 
 void BidirectionalStream::OnHeadersReceived(
     const SpdyHeaderBlock& response_headers) {
   HttpResponseInfo response_info;
   if (!SpdyHeadersToHttpResponse(response_headers, HTTP2, &response_info)) {
     DLOG(WARNING) << "Invalid headers";
     delegate_->OnFailed(ERR_FAILED);
     return;
   }
 
   session_->http_stream_factory()->ProcessAlternativeServices(
       session_, response_info.headers.get(),
       url::SchemeHostPort(request_info_->url));
   delegate_->OnHeadersReceived(response_headers);
 }
 
 void BidirectionalStream::OnDataRead(int bytes_read) {
   DCHECK(read_buffer_);
 
   net_log_.AddByteTransferEvent(
       NetLog::TYPE_BIDIRECTIONAL_STREAM_BYTES_RECEIVED, bytes_read,
       read_buffer_->data());
   read_buffer_ = nullptr;
   delegate_->OnDataRead(bytes_read);
 }
 
 void BidirectionalStream::OnDataSent() {
-  DCHECK(write_buffer_);
+  DCHECK(!write_buffer_list_.empty());
+  DCHECK_EQ(write_buffer_list_.size(), write_buffer_len_list_.size());
 
-  net_log_.AddByteTransferEvent(NetLog::TYPE_BIDIRECTIONAL_STREAM_BYTES_SENT,
-                                write_buffer_len_, write_buffer_->data());
-  write_buffer_ = nullptr;
-  write_buffer_len_ = 0;
+  for (size_t i = 0; i < write_buffer_list_.size(); ++i) {
+    net_log_.AddByteTransferEvent(NetLog::TYPE_BIDIRECTIONAL_STREAM_BYTES_SENT,
+                                  write_buffer_len_list_[i],
+                                  write_buffer_list_[i]->data());
+  }
+  write_buffer_list_.clear();
+  write_buffer_len_list_.clear();
   delegate_->OnDataSent();
 }
 
 void BidirectionalStream::OnTrailersReceived(const SpdyHeaderBlock& trailers) {
   delegate_->OnTrailersReceived(trailers);
 }
 
 void BidirectionalStream::OnFailed(int status) {
   delegate_->OnFailed(status);
 }
 
 void BidirectionalStream::OnStreamReady(const SSLConfig& used_ssl_config,
                                         const ProxyInfo& used_proxy_info,
                                         HttpStream* stream) {
   NOTREACHED();
 }
 
 void BidirectionalStream::OnBidirectionalStreamImplReady(
     const SSLConfig& used_ssl_config,
     const ProxyInfo& used_proxy_info,
     BidirectionalStreamImpl* stream) {
   DCHECK(!stream_impl_);
 
   stream_request_.reset();
   stream_impl_.reset(stream);
-  stream_impl_->Start(request_info_.get(), net_log_, this, std::move(timer_));
+  stream_impl_->Start(request_info_.get(), net_log_, disable_auto_flush_, this,
+                      std::move(timer_));
 }
 
 void BidirectionalStream::OnWebSocketHandshakeStreamReady(
     const SSLConfig& used_ssl_config,
     const ProxyInfo& used_proxy_info,
     WebSocketHandshakeStreamBase* stream) {
   NOTREACHED();
 }
 
 void BidirectionalStream::OnStreamFailed(int result,
@@ skipping 39 matching lines @@
     const ProxyInfo& used_proxy_info,
     HttpStream* stream) {
   DCHECK(stream_request_);
 
   delegate_->OnFailed(ERR_HTTPS_PROXY_TUNNEL_RESPONSE);
 }
 
 void BidirectionalStream::OnQuicBroken() {}
 
 }  // namespace net