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

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

Issue 1452823011: Make PacketReader/PacketWriter interfaces async-only. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rehabbed tests, addressed feedback, made changes to BlimpMessagePump Created 5 years 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 | « no previous file | blimp/net/blimp_connection_unittest.cc » ('j') | blimp/net/blimp_message_pump.h » ('J')
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/blimp_connection.h" 5 #include "blimp/net/blimp_connection.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 22 matching lines...) Expand all
33 // BlimpMessageProcessor implementation. 33 // BlimpMessageProcessor implementation.
34 void ProcessMessage(scoped_ptr<BlimpMessage> message, 34 void ProcessMessage(scoped_ptr<BlimpMessage> message,
35 const net::CompletionCallback& callback) override; 35 const net::CompletionCallback& callback) override;
36 36
37 private: 37 private:
38 void OnWritePacketComplete(int result); 38 void OnWritePacketComplete(int result);
39 39
40 PacketWriter* writer_; 40 PacketWriter* writer_;
41 ConnectionErrorObserver* error_observer_; 41 ConnectionErrorObserver* error_observer_;
42 scoped_refptr<net::DrainableIOBuffer> buffer_; 42 scoped_refptr<net::DrainableIOBuffer> buffer_;
43 net::CancelableCompletionCallback write_packet_callback_;
44 net::CompletionCallback pending_process_msg_callback_; 43 net::CompletionCallback pending_process_msg_callback_;
45 44
46 DISALLOW_COPY_AND_ASSIGN(BlimpMessageSender); 45 DISALLOW_COPY_AND_ASSIGN(BlimpMessageSender);
47 }; 46 };
48 47
49 BlimpMessageSender::BlimpMessageSender(PacketWriter* writer) 48 BlimpMessageSender::BlimpMessageSender(PacketWriter* writer)
50 : writer_(writer), 49 : writer_(writer),
51 buffer_(new net::DrainableIOBuffer( 50 buffer_(new net::DrainableIOBuffer(
52 new net::IOBuffer(kMaxPacketPayloadSizeBytes), 51 new net::IOBuffer(kMaxPacketPayloadSizeBytes),
53 kMaxPacketPayloadSizeBytes)) { 52 kMaxPacketPayloadSizeBytes)) {
(...skipping 11 matching lines...) Expand all
65 return; 64 return;
66 } 65 }
67 66
68 buffer_->SetOffset(0); 67 buffer_->SetOffset(0);
69 if (!message->SerializeToArray(buffer_->data(), message->ByteSize())) { 68 if (!message->SerializeToArray(buffer_->data(), message->ByteSize())) {
70 DLOG(ERROR) << "Failed to serialize message."; 69 DLOG(ERROR) << "Failed to serialize message.";
71 callback.Run(net::ERR_INVALID_ARGUMENT); 70 callback.Run(net::ERR_INVALID_ARGUMENT);
72 return; 71 return;
73 } 72 }
74 73
75 write_packet_callback_.Reset(base::Bind(
76 &BlimpMessageSender::OnWritePacketComplete, base::Unretained(this)));
77 pending_process_msg_callback_ = callback; 74 pending_process_msg_callback_ = callback;
78 int result = writer_->WritePacket(buffer_, write_packet_callback_.callback()); 75 writer_->WritePacket(buffer_,
79 if (result != net::ERR_IO_PENDING) { 76 base::Bind(&BlimpMessageSender::OnWritePacketComplete,
80 base::MessageLoop::current()->PostTask( 77 base::Unretained(this)));
81 FROM_HERE, base::Bind(write_packet_callback_.callback(), result));
82 }
83 } 78 }
84 79
85 void BlimpMessageSender::OnWritePacketComplete(int result) { 80 void BlimpMessageSender::OnWritePacketComplete(int result) {
86 DCHECK_NE(net::ERR_IO_PENDING, result); 81 DCHECK_NE(net::ERR_IO_PENDING, result);
87 write_packet_callback_.Cancel();
88 base::ResetAndReturn(&pending_process_msg_callback_).Run(result); 82 base::ResetAndReturn(&pending_process_msg_callback_).Run(result);
89 if (result != net::OK) { 83 if (result != net::OK) {
90 error_observer_->OnConnectionError(result); 84 error_observer_->OnConnectionError(result);
91 } 85 }
92 } 86 }
93 87
94 } // namespace 88 } // namespace
95 89
96 BlimpConnection::BlimpConnection(scoped_ptr<PacketReader> reader, 90 BlimpConnection::BlimpConnection(scoped_ptr<PacketReader> reader,
97 scoped_ptr<PacketWriter> writer) 91 scoped_ptr<PacketWriter> writer)
(...skipping 17 matching lines...) Expand all
115 void BlimpConnection::SetIncomingMessageProcessor( 109 void BlimpConnection::SetIncomingMessageProcessor(
116 BlimpMessageProcessor* processor) { 110 BlimpMessageProcessor* processor) {
117 message_pump_->SetMessageProcessor(processor); 111 message_pump_->SetMessageProcessor(processor);
118 } 112 }
119 113
120 BlimpMessageProcessor* BlimpConnection::GetOutgoingMessageProcessor() const { 114 BlimpMessageProcessor* BlimpConnection::GetOutgoingMessageProcessor() const {
121 return outgoing_msg_processor_.get(); 115 return outgoing_msg_processor_.get();
122 } 116 }
123 117
124 } // namespace blimp 118 } // namespace blimp
OLDNEW
« no previous file with comments | « no previous file | blimp/net/blimp_connection_unittest.cc » ('j') | blimp/net/blimp_message_pump.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698