Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1042)

Unified Diff: components/cronet/ios/cronet_bidirectional_stream.cc

Issue 2492703002: Third try at landing gRPC refactoring. Previous issue failed on the waterfall (Closed)
Patch Set: Change DCHECK Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/cronet/ios/cronet_bidirectional_stream.h ('k') | components/cronet/ios/cronet_c_for_grpc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/ios/cronet_bidirectional_stream.cc
diff --git a/components/cronet/ios/cronet_bidirectional_stream.cc b/components/cronet/ios/cronet_bidirectional_stream.cc
deleted file mode 100644
index 325b611e361a8effa941ec8304b59863d5b19994..0000000000000000000000000000000000000000
--- a/components/cronet/ios/cronet_bidirectional_stream.cc
+++ /dev/null
@@ -1,390 +0,0 @@
-// Copyright 2016 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 "components/cronet/ios/cronet_bidirectional_stream.h"
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "base/bind.h"
-#include "base/location.h"
-#include "base/logging.h"
-#include "base/memory/ref_counted.h"
-#include "base/strings/string_number_conversions.h"
-#include "components/cronet/ios/cronet_environment.h"
-#include "net/base/io_buffer.h"
-#include "net/base/net_errors.h"
-#include "net/base/request_priority.h"
-#include "net/http/bidirectional_stream.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_status_code.h"
-#include "net/http/http_transaction_factory.h"
-#include "net/http/http_util.h"
-#include "net/spdy/spdy_header_block.h"
-#include "net/ssl/ssl_info.h"
-#include "net/url_request/http_user_agent_settings.h"
-#include "net/url_request/url_request_context.h"
-#include "url/gurl.h"
-
-namespace cronet {
-
-CronetBidirectionalStream::WriteBuffers::WriteBuffers() {}
-
-CronetBidirectionalStream::WriteBuffers::~WriteBuffers() {}
-
-void CronetBidirectionalStream::WriteBuffers::Clear() {
- write_buffer_list.clear();
- write_buffer_len_list.clear();
-}
-
-void CronetBidirectionalStream::WriteBuffers::AppendBuffer(
- const scoped_refptr<net::IOBuffer>& buffer,
- int buffer_size) {
- write_buffer_list.push_back(buffer);
- write_buffer_len_list.push_back(buffer_size);
-}
-
-void CronetBidirectionalStream::WriteBuffers::MoveTo(WriteBuffers* target) {
- std::move(write_buffer_list.begin(), write_buffer_list.end(),
- std::back_inserter(target->write_buffer_list));
- std::move(write_buffer_len_list.begin(), write_buffer_len_list.end(),
- std::back_inserter(target->write_buffer_len_list));
- Clear();
-}
-
-bool CronetBidirectionalStream::WriteBuffers::Empty() const {
- return write_buffer_list.empty();
-}
-
-CronetBidirectionalStream::CronetBidirectionalStream(
- CronetEnvironment* environment,
- Delegate* delegate)
- : read_state_(NOT_STARTED),
- write_state_(NOT_STARTED),
- write_end_of_stream_(false),
- request_headers_sent_(false),
- disable_auto_flush_(false),
- delay_headers_until_flush_(false),
- environment_(environment),
- pending_write_data_(new WriteBuffers()),
- flushing_write_data_(new WriteBuffers()),
- sending_write_data_(new WriteBuffers()),
- delegate_(delegate),
- weak_factory_(this) {
- weak_this_ = weak_factory_.GetWeakPtr();
-}
-
-CronetBidirectionalStream::~CronetBidirectionalStream() {
- DCHECK(environment_->IsOnNetworkThread());
-}
-
-int CronetBidirectionalStream::Start(const char* url,
- int priority,
- const char* method,
- const net::HttpRequestHeaders& headers,
- bool end_of_stream) {
- // Prepare request info here to be able to return the error.
- std::unique_ptr<net::BidirectionalStreamRequestInfo> request_info(
- new net::BidirectionalStreamRequestInfo());
- request_info->url = GURL(url);
- request_info->priority = static_cast<net::RequestPriority>(priority);
- // Http method is a token, just as header name.
- request_info->method = method;
- if (!net::HttpUtil::IsValidHeaderName(request_info->method))
- return -1;
- request_info->extra_headers.CopyFrom(headers);
- request_info->end_stream_on_headers = end_of_stream;
- write_end_of_stream_ = end_of_stream;
- DCHECK(environment_);
- environment_->PostToNetworkThread(
- FROM_HERE, base::Bind(&CronetBidirectionalStream::StartOnNetworkThread,
- weak_this_, base::Passed(&request_info)));
- return 0;
-}
-
-bool CronetBidirectionalStream::ReadData(char* buffer, int capacity) {
- if (!buffer)
- return false;
- scoped_refptr<net::WrappedIOBuffer> read_buffer(
- new net::WrappedIOBuffer(buffer));
-
- environment_->PostToNetworkThread(
- FROM_HERE, base::Bind(&CronetBidirectionalStream::ReadDataOnNetworkThread,
- weak_this_, read_buffer, capacity));
- return true;
-}
-
-bool CronetBidirectionalStream::WriteData(const char* buffer,
- int count,
- bool end_of_stream) {
- if (!buffer)
- return false;
-
- scoped_refptr<net::WrappedIOBuffer> write_buffer(
- new net::WrappedIOBuffer(buffer));
-
- environment_->PostToNetworkThread(
- FROM_HERE,
- base::Bind(&CronetBidirectionalStream::WriteDataOnNetworkThread,
- weak_this_, write_buffer, count, end_of_stream));
- return true;
-}
-
-void CronetBidirectionalStream::Flush() {
- environment_->PostToNetworkThread(
- FROM_HERE,
- base::Bind(&CronetBidirectionalStream::FlushOnNetworkThread, weak_this_));
-}
-
-void CronetBidirectionalStream::Cancel() {
- environment_->PostToNetworkThread(
- FROM_HERE, base::Bind(&CronetBidirectionalStream::CancelOnNetworkThread,
- weak_this_));
-}
-
-void CronetBidirectionalStream::Destroy() {
- // Destroy could be called from any thread, including network thread (if
- // posting task to executor throws an exception), but is posted, so |this|
- // is valid until calling task is complete.
- environment_->PostToNetworkThread(
- FROM_HERE, base::Bind(&CronetBidirectionalStream::DestroyOnNetworkThread,
- base::Unretained(this)));
-}
-
-void CronetBidirectionalStream::OnStreamReady(bool request_headers_sent) {
- DCHECK(environment_->IsOnNetworkThread());
- DCHECK_EQ(STARTED, write_state_);
- if (!bidi_stream_)
- return;
- request_headers_sent_ = request_headers_sent;
- write_state_ = WAITING_FOR_FLUSH;
- if (write_end_of_stream_) {
- if (!request_headers_sent) {
- // If there is no data to write, then just send headers explicitly.
- bidi_stream_->SendRequestHeaders();
- request_headers_sent_ = true;
- }
- write_state_ = WRITING_DONE;
- }
- delegate_->OnStreamReady();
-}
-
-void CronetBidirectionalStream::OnHeadersReceived(
- const net::SpdyHeaderBlock& response_headers) {
- DCHECK(environment_->IsOnNetworkThread());
- DCHECK_EQ(STARTED, read_state_);
- if (!bidi_stream_)
- return;
- read_state_ = WAITING_FOR_READ;
- // Get http status code from response headers.
- int http_status_code = 0;
- const auto http_status_header = response_headers.find(":status");
- if (http_status_header != response_headers.end())
- base::StringToInt(http_status_header->second, &http_status_code);
- const char* protocol = "unknown";
- switch (bidi_stream_->GetProtocol()) {
- case net::kProtoHTTP2:
- protocol = "h2";
- break;
- case net::kProtoQUIC:
- protocol = "quic/1+spdy/3";
- break;
- default:
- break;
- }
- delegate_->OnHeadersReceived(response_headers, protocol);
-}
-
-void CronetBidirectionalStream::OnDataRead(int bytes_read) {
- DCHECK(environment_->IsOnNetworkThread());
- DCHECK_EQ(READING, read_state_);
- if (!bidi_stream_)
- return;
- read_state_ = WAITING_FOR_READ;
- delegate_->OnDataRead(read_buffer_->data(), bytes_read);
-
- // Free the read buffer.
- read_buffer_ = nullptr;
- if (bytes_read == 0)
- read_state_ = READING_DONE;
- MaybeOnSucceded();
-}
-
-void CronetBidirectionalStream::OnDataSent() {
- DCHECK(environment_->IsOnNetworkThread());
- if (!bidi_stream_)
- return;
- DCHECK_EQ(WRITING, write_state_);
- write_state_ = WAITING_FOR_FLUSH;
- for (const scoped_refptr<net::IOBuffer>& buffer :
- sending_write_data_->buffers()) {
- delegate_->OnDataSent(buffer->data());
- }
- sending_write_data_->Clear();
- // Send data flushed while other data was sending.
- if (!flushing_write_data_->Empty()) {
- SendFlushingWriteData();
- return;
- }
- if (write_end_of_stream_ && pending_write_data_->Empty()) {
- write_state_ = WRITING_DONE;
- MaybeOnSucceded();
- }
-}
-
-void CronetBidirectionalStream::OnTrailersReceived(
- const net::SpdyHeaderBlock& response_trailers) {
- DCHECK(environment_->IsOnNetworkThread());
- if (!bidi_stream_)
- return;
- delegate_->OnTrailersReceived(response_trailers);
-}
-
-void CronetBidirectionalStream::OnFailed(int error) {
- DCHECK(environment_->IsOnNetworkThread());
- if (!bidi_stream_ && read_state_ != NOT_STARTED)
- return;
- read_state_ = write_state_ = ERROR;
- weak_factory_.InvalidateWeakPtrs();
- // Delete underlying |bidi_stream_| asynchronously as it may still be used.
- environment_->PostToNetworkThread(
- FROM_HERE, base::Bind(&base::DeletePointer<net::BidirectionalStream>,
- bidi_stream_.release()));
- delegate_->OnFailed(error);
-}
-
-void CronetBidirectionalStream::StartOnNetworkThread(
- std::unique_ptr<net::BidirectionalStreamRequestInfo> request_info) {
- DCHECK(environment_->IsOnNetworkThread());
- DCHECK(!bidi_stream_);
- DCHECK(environment_->GetURLRequestContext());
- request_info->extra_headers.SetHeaderIfMissing(
- net::HttpRequestHeaders::kUserAgent, environment_->user_agent());
- bidi_stream_.reset(new net::BidirectionalStream(
- std::move(request_info), environment_->GetURLRequestContext()
- ->http_transaction_factory()
- ->GetSession(),
- !delay_headers_until_flush_, this));
- DCHECK(read_state_ == NOT_STARTED && write_state_ == NOT_STARTED);
- read_state_ = write_state_ = STARTED;
-}
-
-void CronetBidirectionalStream::ReadDataOnNetworkThread(
- scoped_refptr<net::WrappedIOBuffer> read_buffer,
- int buffer_size) {
- DCHECK(environment_->IsOnNetworkThread());
- DCHECK(read_buffer);
- DCHECK(!read_buffer_);
- if (read_state_ != WAITING_FOR_READ) {
- DLOG(ERROR) << "Unexpected Read Data in read_state " << read_state_;
- // Invoke OnFailed unless it is already invoked.
- if (read_state_ != ERROR)
- OnFailed(net::ERR_UNEXPECTED);
- return;
- }
- read_state_ = READING;
- read_buffer_ = read_buffer;
-
- int bytes_read = bidi_stream_->ReadData(read_buffer_.get(), buffer_size);
- // If IO is pending, wait for the BidirectionalStream to call OnDataRead.
- if (bytes_read == net::ERR_IO_PENDING)
- return;
-
- if (bytes_read < 0) {
- OnFailed(bytes_read);
- return;
- }
- OnDataRead(bytes_read);
-}
-
-void CronetBidirectionalStream::WriteDataOnNetworkThread(
- scoped_refptr<net::WrappedIOBuffer> write_buffer,
- int buffer_size,
- bool end_of_stream) {
- DCHECK(environment_->IsOnNetworkThread());
- DCHECK(write_buffer);
- DCHECK(!write_end_of_stream_);
- if (!bidi_stream_ || write_end_of_stream_) {
- DLOG(ERROR) << "Unexpected Flush Data in write_state " << write_state_;
- // Invoke OnFailed unless it is already invoked.
- if (write_state_ != ERROR)
- OnFailed(net::ERR_UNEXPECTED);
- return;
- }
- pending_write_data_->AppendBuffer(write_buffer, buffer_size);
- write_end_of_stream_ = end_of_stream;
- if (!disable_auto_flush_)
- FlushOnNetworkThread();
-}
-
-void CronetBidirectionalStream::FlushOnNetworkThread() {
- DCHECK(environment_->IsOnNetworkThread());
- if (!bidi_stream_)
- return;
- // If there is no data to flush, may need to send headers.
- if (pending_write_data_->Empty()) {
- if (!request_headers_sent_) {
- request_headers_sent_ = true;
- bidi_stream_->SendRequestHeaders();
- }
- return;
- }
- // If request headers are not sent yet, they will be sent with the data.
- if (!request_headers_sent_)
- request_headers_sent_ = true;
-
- // Move pending data to the flushing list.
- pending_write_data_->MoveTo(flushing_write_data_.get());
- DCHECK(pending_write_data_->Empty());
- if (write_state_ != WRITING)
- SendFlushingWriteData();
-}
-
-void CronetBidirectionalStream::SendFlushingWriteData() {
- DCHECK(bidi_stream_);
- // If previous send is not done, or there is nothing to flush, then exit.
- if (write_state_ == WRITING || flushing_write_data_->Empty())
- return;
- DCHECK(sending_write_data_->Empty());
- write_state_ = WRITING;
- flushing_write_data_->MoveTo(sending_write_data_.get());
- bidi_stream_->SendvData(sending_write_data_->buffers(),
- sending_write_data_->lengths(),
- write_end_of_stream_ && pending_write_data_->Empty());
-}
-
-void CronetBidirectionalStream::CancelOnNetworkThread() {
- DCHECK(environment_->IsOnNetworkThread());
- if (!bidi_stream_)
- return;
- read_state_ = write_state_ = CANCELED;
- bidi_stream_.reset();
- weak_factory_.InvalidateWeakPtrs();
- delegate_->OnCanceled();
-}
-
-void CronetBidirectionalStream::DestroyOnNetworkThread() {
- DCHECK(environment_->IsOnNetworkThread());
- delete this;
-}
-
-void CronetBidirectionalStream::MaybeOnSucceded() {
- DCHECK(environment_->IsOnNetworkThread());
- if (!bidi_stream_)
- return;
- if (read_state_ == READING_DONE && write_state_ == WRITING_DONE) {
- read_state_ = write_state_ = SUCCESS;
- weak_factory_.InvalidateWeakPtrs();
- // Delete underlying |bidi_stream_| asynchronously as it may still be used.
- environment_->PostToNetworkThread(
- FROM_HERE, base::Bind(&base::DeletePointer<net::BidirectionalStream>,
- bidi_stream_.release()));
- delegate_->OnSucceeded();
- }
-}
-
-} // namespace cronet
« no previous file with comments | « components/cronet/ios/cronet_bidirectional_stream.h ('k') | components/cronet/ios/cronet_c_for_grpc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698