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 "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/bidirectional_stream_request_info.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_response_headers.h"
 #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(
     scoped_ptr<BidirectionalStreamRequestInfo> request_info,
     HttpNetworkSession* session,
+    bool disable_auto_flush,
     Delegate* delegate)
     : BidirectionalStream(std::move(request_info),
                           session,
+                          disable_auto_flush,
                           delegate,
                           make_scoped_ptr(new base::Timer(false, false))) {}
 
 BidirectionalStream::BidirectionalStream(
     scoped_ptr<BidirectionalStreamRequestInfo> request_info,
     HttpNetworkSession* session,
+    bool disable_auto_flush,
     Delegate* delegate,
     scoped_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)) {
   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);
 
@@ skipping 31 matching lines @@
 }
 
 void BidirectionalStream::SendData(IOBuffer* data,
                                    int length,
                                    bool end_stream) {
   DCHECK(stream_impl_);
 
   stream_impl_->SendData(data, length, end_stream);
 }
 
+void BidirectionalStream::SendvData(const std::vector<IOBuffer*>& buffers,
+                                    const std::vector<int>& lengths,
+                                    bool end_stream) {
+  DCHECK(stream_impl_);
+
+  stream_impl_->SendvData(buffers, lengths, end_stream);
+}
+
 void BidirectionalStream::Cancel() {
   stream_request_.reset();
   if (stream_impl_) {
     stream_impl_->Cancel();
     stream_impl_.reset();
   }
 }
 
 NextProto BidirectionalStream::GetProtocol() const {
   if (!stream_impl_)
     return kProtoUnknown;
 
   return stream_impl_->GetProtocol();
 }
 
 int64_t BidirectionalStream::GetTotalReceivedBytes() const {
   if (!stream_impl_)
     return 0;
 
   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;
   }
@@ skipping 27 matching lines @@
 }
 
 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