summaryrefslogtreecommitdiffstats
path: root/blimp/net
diff options
context:
space:
mode:
authorhaibinlu <haibinlu@chromium.org>2016-01-11 15:51:48 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-11 23:53:21 +0000
commit6bd6e37171662b6cbf1ff628c30688a6d4965ece (patch)
tree3fbeb24e9fdec7834a691331e98c26c74b2c9475 /blimp/net
parentf97f99e6e4f67c134638f4b933718c29a3a70118 (diff)
downloadchromium_src-6bd6e37171662b6cbf1ff628c30688a6d4965ece.zip
chromium_src-6bd6e37171662b6cbf1ff628c30688a6d4965ece.tar.gz
chromium_src-6bd6e37171662b6cbf1ff628c30688a6d4965ece.tar.bz2
[Blimp] Always invoke callback after a feature finishes processing a message.
Network layer waits for the callback to be invoked with OK before it reads next message. If a feature does not invokes callback, it will block all features from receiving more messages. BUG=576350 Review URL: https://codereview.chromium.org/1571413003 Cr-Commit-Position: refs/heads/master@{#368722}
Diffstat (limited to 'blimp/net')
-rw-r--r--blimp/net/blimp_message_demultiplexer.cc1
-rw-r--r--blimp/net/blimp_message_pump.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/blimp/net/blimp_message_demultiplexer.cc b/blimp/net/blimp_message_demultiplexer.cc
index 1444c9fd..8c69702 100644
--- a/blimp/net/blimp_message_demultiplexer.cc
+++ b/blimp/net/blimp_message_demultiplexer.cc
@@ -29,6 +29,7 @@ void BlimpMessageDemultiplexer::AddProcessor(BlimpMessage::Type type,
void BlimpMessageDemultiplexer::ProcessMessage(
scoped_ptr<BlimpMessage> message,
const net::CompletionCallback& callback) {
+ DVLOG(2) << "ProcessMessage : " << *message;
auto receiver_iter = feature_receiver_map_.find(message->type());
if (receiver_iter == feature_receiver_map_.end()) {
DLOG(ERROR) << "No registered receiver for " << *message << ".";
diff --git a/blimp/net/blimp_message_pump.cc b/blimp/net/blimp_message_pump.cc
index ae264e1..c3d6380 100644
--- a/blimp/net/blimp_message_pump.cc
+++ b/blimp/net/blimp_message_pump.cc
@@ -59,6 +59,7 @@ void BlimpMessagePump::OnReadPacketComplete(int result) {
if (result == net::OK) {
scoped_ptr<BlimpMessage> message(new BlimpMessage);
if (message->ParseFromArray(buffer_->StartOfBuffer(), buffer_->offset())) {
+ DVLOG(2) << "OnReadPacketComplete, result=" << *message;
processor_->ProcessMessage(std::move(message),
process_msg_callback_.callback());
} else {