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

Side by Side Diff: remoting/protocol/message_reader.cc

Issue 10066042: Refcounted types should not have public destructors, remoting/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Few fixes Created 8 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « remoting/protocol/message_reader.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "remoting/protocol/message_reader.h" 5 #include "remoting/protocol/message_reader.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
11 #include "net/base/net_errors.h" 11 #include "net/base/net_errors.h"
12 #include "net/socket/socket.h" 12 #include "net/socket/socket.h"
13 #include "remoting/base/compound_buffer.h" 13 #include "remoting/base/compound_buffer.h"
14 #include "remoting/proto/internal.pb.h" 14 #include "remoting/proto/internal.pb.h"
15 15
16 namespace remoting { 16 namespace remoting {
17 namespace protocol { 17 namespace protocol {
18 18
19 static const int kReadBufferSize = 4096; 19 static const int kReadBufferSize = 4096;
20 20
21 MessageReader::MessageReader() 21 MessageReader::MessageReader()
22 : socket_(NULL), 22 : socket_(NULL),
23 read_pending_(false), 23 read_pending_(false),
24 pending_messages_(0), 24 pending_messages_(0),
25 closed_(false) { 25 closed_(false) {
26 } 26 }
27 27
28 MessageReader::~MessageReader() {
29 CHECK_EQ(pending_messages_, 0);
30 }
31
32 void MessageReader::Init(net::Socket* socket, 28 void MessageReader::Init(net::Socket* socket,
33 const MessageReceivedCallback& callback) { 29 const MessageReceivedCallback& callback) {
34 message_received_callback_ = callback; 30 message_received_callback_ = callback;
35 DCHECK(socket); 31 DCHECK(socket);
36 socket_ = socket; 32 socket_ = socket;
37 DoRead(); 33 DoRead();
38 } 34 }
39 35
36 MessageReader::~MessageReader() {
37 CHECK_EQ(pending_messages_, 0);
38 }
39
40 void MessageReader::DoRead() { 40 void MessageReader::DoRead() {
41 // Don't try to read again if there is another read pending or we 41 // Don't try to read again if there is another read pending or we
42 // have messages that we haven't finished processing yet. 42 // have messages that we haven't finished processing yet.
43 while (!closed_ && !read_pending_ && pending_messages_ == 0) { 43 while (!closed_ && !read_pending_ && pending_messages_ == 0) {
44 read_buffer_ = new net::IOBuffer(kReadBufferSize); 44 read_buffer_ = new net::IOBuffer(kReadBufferSize);
45 int result = socket_->Read( 45 int result = socket_->Read(
46 read_buffer_, kReadBufferSize, base::Bind(&MessageReader::OnRead, 46 read_buffer_, kReadBufferSize, base::Bind(&MessageReader::OnRead,
47 base::Unretained(this))); 47 base::Unretained(this)));
48 HandleReadResult(result); 48 HandleReadResult(result);
49 } 49 }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 void MessageReader::ProcessDoneEvent() { 116 void MessageReader::ProcessDoneEvent() {
117 pending_messages_--; 117 pending_messages_--;
118 DCHECK_GE(pending_messages_, 0); 118 DCHECK_GE(pending_messages_, 0);
119 119
120 DoRead(); // Start next read if neccessary. 120 DoRead(); // Start next read if neccessary.
121 } 121 }
122 122
123 } // namespace protocol 123 } // namespace protocol
124 } // namespace remoting 124 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/message_reader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698