Implementation and fixes for Blimp client/engine E2E communication.

blimp/net/blimp_message_output_buffer.cc

 // Copyright 2015 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 "blimp/net/blimp_message_output_buffer.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "net/base/net_errors.h"
 
 namespace blimp {
 
 BlimpMessageOutputBuffer::BlimpMessageOutputBuffer(int max_buffer_size_bytes)
     : max_buffer_size_bytes_(max_buffer_size_bytes) {}
 
 BlimpMessageOutputBuffer::~BlimpMessageOutputBuffer() {}
 
 void BlimpMessageOutputBuffer::SetOutputProcessor(
     BlimpMessageProcessor* processor) {
+  DVLOG(1) << "SetOutputProcessor " << processor;
   // Check that we are setting or removing the processor, not replacing it.
   if (processor) {
     DCHECK(!output_processor_);
     output_processor_ = processor;
     write_complete_cb_.Reset(base::Bind(
         &BlimpMessageOutputBuffer::OnWriteComplete, base::Unretained(this)));
     WriteNextMessageIfReady();
   } else {
     DCHECK(output_processor_);
     output_processor_ = nullptr;
     write_complete_cb_.Cancel();
   }
 }
 
 void BlimpMessageOutputBuffer::RetransmitBufferedMessages() {
   DCHECK(output_processor_);
+  DVLOG(1) << "RetransmitBufferedMessages()";
 
   // Prepend the entirety of |ack_buffer_| to |write_buffer_|.
   write_buffer_.insert(write_buffer_.begin(),
                        std::make_move_iterator(ack_buffer_.begin()),
                        std::make_move_iterator(ack_buffer_.end()));
   ack_buffer_.clear();
 
   WriteNextMessageIfReady();
 }
 
 int BlimpMessageOutputBuffer::GetBufferByteSizeForTest() const {
   return write_buffer_.size() + ack_buffer_.size();
 }
 
 int BlimpMessageOutputBuffer::GetUnacknowledgedMessageCountForTest() const {
   return ack_buffer_.size();
 }
 
 void BlimpMessageOutputBuffer::ProcessMessage(
     scoped_ptr<BlimpMessage> message,
     const net::CompletionCallback& callback) {
-  VLOG(2) << "ProcessMessage (id=" << message->message_id()
-          << ", type=" << message->type() << ")";
+  VLOG(2) << "OutputBuffer ProcessMessage (id=" << message->message_id()

[haibinlu, 2015/12/29 00:51:45]

DVLOG instead?

[Kevin M, 2015/12/30 23:08:49]

Done.

+          << ", type=" << message->type() << ", size=" << message->ByteSize()
+          << ")";
 
   message->set_message_id(++prev_message_id_);
 
   current_buffer_size_bytes_ += message->ByteSize();
   DCHECK_GE(max_buffer_size_bytes_, current_buffer_size_bytes_);
 
   write_buffer_.push_back(
       make_scoped_ptr(new BufferEntry(std::move(message), callback)));
 
   // Write the message
@@ skipping 41 matching lines @@
 }
 
 BlimpMessageOutputBuffer::BufferEntry::BufferEntry(
     scoped_ptr<BlimpMessage> message,
     net::CompletionCallback callback)
     : message(std::move(message)), callback(callback) {}
 
 BlimpMessageOutputBuffer::BufferEntry::~BufferEntry() {}
 
 void BlimpMessageOutputBuffer::WriteNextMessageIfReady() {
+  DVLOG(3) << "WriteNextMessageIfReady";
   if (write_buffer_.empty()) {
-    VLOG(2) << "Nothing to write.";
+    DVLOG(3) << "Nothing to write.";
     return;
   }
 
   scoped_ptr<BlimpMessage> message_to_write(
       new BlimpMessage(*write_buffer_.front()->message));
-  VLOG(3) << "Writing message (id="
-          << write_buffer_.front()->message->message_id()
-          << ", type=" << message_to_write->type() << ")";
+  DVLOG(3) << "Writing message (id="
+           << write_buffer_.front()->message->message_id()
+           << ", type=" << message_to_write->type() << ")";
 
   output_processor_->ProcessMessage(std::move(message_to_write),
                                     write_complete_cb_.callback());
-  VLOG(3) << "Queue size: " << write_buffer_.size();
+  DVLOG(3) << "Queue size: " << write_buffer_.size();
 }
 
 void BlimpMessageOutputBuffer::OnWriteComplete(int result) {
   DCHECK_LE(result, net::OK);
   VLOG(2) << "Write complete, result=" << result;
 
   if (result == net::OK) {
     ack_buffer_.push_back(std::move(write_buffer_.front()));
     write_buffer_.pop_front();
     WriteNextMessageIfReady();
   } else {
     // An error occurred while writing to the network connection.
     // Stop writing more messages until a new connection is established.
     DLOG(WARNING) << "Write error (result=" << result << ")";
   }
 }
 
 }  // namespace blimp