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

Side by Side Diff: blimp/net/stream_packet_reader.cc

Issue 2008283004: Revert of Added a debug info UI for Blimp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months 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 unified diff | Download patch
« no previous file with comments | « blimp/net/stream_packet_reader.h ('k') | blimp/net/stream_packet_reader_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "blimp/net/stream_packet_reader.h" 5 #include "blimp/net/stream_packet_reader.h"
6 6
7 #include <iostream> 7 #include <iostream>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/sys_byteorder.h" 13 #include "base/sys_byteorder.h"
14 #include "blimp/net/blimp_connection_statistics.h"
15 #include "blimp/net/common.h" 14 #include "blimp/net/common.h"
16 #include "net/base/io_buffer.h" 15 #include "net/base/io_buffer.h"
17 #include "net/base/net_errors.h" 16 #include "net/base/net_errors.h"
18 #include "net/socket/stream_socket.h" 17 #include "net/socket/stream_socket.h"
19 18
20 namespace blimp { 19 namespace blimp {
21 20
22 std::ostream& operator<<(std::ostream& out, 21 std::ostream& operator<<(std::ostream& out,
23 const StreamPacketReader::ReadState state) { 22 const StreamPacketReader::ReadState state) {
24 switch (state) { 23 switch (state) {
25 case StreamPacketReader::ReadState::HEADER: 24 case StreamPacketReader::ReadState::HEADER:
26 out << "HEADER"; 25 out << "HEADER";
27 break; 26 break;
28 case StreamPacketReader::ReadState::PAYLOAD: 27 case StreamPacketReader::ReadState::PAYLOAD:
29 out << "PAYLOAD"; 28 out << "PAYLOAD";
30 break; 29 break;
31 case StreamPacketReader::ReadState::IDLE: 30 case StreamPacketReader::ReadState::IDLE:
32 out << "IDLE"; 31 out << "IDLE";
33 break; 32 break;
34 } 33 }
35 return out; 34 return out;
36 } 35 }
37 36
38 StreamPacketReader::StreamPacketReader(net::StreamSocket* socket, 37 StreamPacketReader::StreamPacketReader(net::StreamSocket* socket)
39 BlimpConnectionStatistics* statistics) 38 : read_state_(ReadState::IDLE), socket_(socket), weak_factory_(this) {
40 : read_state_(ReadState::IDLE),
41 socket_(socket),
42 statistics_(statistics),
43 weak_factory_(this) {
44 DCHECK(socket_); 39 DCHECK(socket_);
45 header_buffer_ = new net::GrowableIOBuffer; 40 header_buffer_ = new net::GrowableIOBuffer;
46 header_buffer_->SetCapacity(kPacketHeaderSizeBytes); 41 header_buffer_->SetCapacity(kPacketHeaderSizeBytes);
47 } 42 }
48 43
49 StreamPacketReader::~StreamPacketReader() {} 44 StreamPacketReader::~StreamPacketReader() {}
50 45
51 void StreamPacketReader::ReadPacket( 46 void StreamPacketReader::ReadPacket(
52 const scoped_refptr<net::GrowableIOBuffer>& buf, 47 const scoped_refptr<net::GrowableIOBuffer>& buf,
53 const net::CompletionCallback& callback) { 48 const net::CompletionCallback& callback) {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 DCHECK_EQ(ReadState::PAYLOAD, read_state_); 131 DCHECK_EQ(ReadState::PAYLOAD, read_state_);
137 DCHECK_GE(result, 0); 132 DCHECK_GE(result, 0);
138 133
139 payload_buffer_->set_offset(payload_buffer_->offset() + result); 134 payload_buffer_->set_offset(payload_buffer_->offset() + result);
140 if (static_cast<size_t>(payload_buffer_->offset()) < payload_size_) { 135 if (static_cast<size_t>(payload_buffer_->offset()) < payload_size_) {
141 return socket_->Read(payload_buffer_.get(), 136 return socket_->Read(payload_buffer_.get(),
142 payload_size_ - payload_buffer_->offset(), 137 payload_size_ - payload_buffer_->offset(),
143 base::Bind(&StreamPacketReader::OnReadComplete, 138 base::Bind(&StreamPacketReader::OnReadComplete,
144 weak_factory_.GetWeakPtr())); 139 weak_factory_.GetWeakPtr()));
145 } 140 }
146 statistics_->Add(BlimpConnectionStatistics::BYTES_RECEIVED, payload_size_);
147 141
148 // Finished reading the payload. 142 // Finished reading the payload.
149 read_state_ = ReadState::IDLE; 143 read_state_ = ReadState::IDLE;
150 payload_buffer_->set_offset(0); 144 payload_buffer_->set_offset(0);
151 return payload_size_; 145 return payload_size_;
152 } 146 }
153 147
154 void StreamPacketReader::OnReadComplete(int result) { 148 void StreamPacketReader::OnReadComplete(int result) {
155 DCHECK_NE(net::ERR_IO_PENDING, result); 149 DCHECK_NE(net::ERR_IO_PENDING, result);
156 150
(...skipping 11 matching lines...) Expand all
168 // If all reading completed, either successfully or by error, inform the 162 // If all reading completed, either successfully or by error, inform the
169 // caller. 163 // caller.
170 if (result != net::ERR_IO_PENDING) { 164 if (result != net::ERR_IO_PENDING) {
171 payload_buffer_ = nullptr; 165 payload_buffer_ = nullptr;
172 base::ResetAndReturn(&callback_) 166 base::ResetAndReturn(&callback_)
173 .Run(result == net::OK ? payload_size_ : result); 167 .Run(result == net::OK ? payload_size_ : result);
174 } 168 }
175 } 169 }
176 170
177 } // namespace blimp 171 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/net/stream_packet_reader.h ('k') | blimp/net/stream_packet_reader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698