Cast channel logging: log additional statistics.

extensions/browser/api/cast_channel/logger.cc

 // Copyright 2014 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 "extensions/browser/api/cast_channel/logger.h"
 
 #include "base/strings/string_util.h"
 #include "base/time/tick_clock.h"
 #include "extensions/browser/api/cast_channel/cast_auth_util.h"
 
@@ skipping 46 matching lines @@
 
 }  // namespace
 
 Logger::AggregatedSocketEventLog::AggregatedSocketEventLog() {
 }
 Logger::AggregatedSocketEventLog::~AggregatedSocketEventLog() {
 }
 
 Logger::Logger(scoped_ptr<base::TickClock> clock,
                base::TimeTicks unix_epoch_time_ticks)
-    : clock_(clock.Pass()),
-      unix_epoch_time_ticks_(unix_epoch_time_ticks),
-      num_evicted_aggregated_socket_events_(0),
-      num_evicted_socket_events_(0) {
+    : clock_(clock.Pass()), unix_epoch_time_ticks_(unix_epoch_time_ticks) {
   DCHECK(clock_);
 
   // Logger may not be necessarily be created on the IO thread, but logging
   // happens exclusively there.
   thread_checker_.DetachFromThread();
 }
 
 Logger::~Logger() {
 }
 
 void Logger::LogNewSocketEvent(const CastSocket& cast_socket) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   int channel_id = cast_socket.id();
   SocketEvent event = CreateEvent(proto::CAST_SOCKET_CREATED);
   LogSocketEvent(channel_id, event);
 
+  AggregatedSocketEventLogMap::iterator it =
+      aggregated_socket_events_.find(channel_id);
+  CHECK(it != aggregated_socket_events_.end());
+
   AggregatedSocketEvent& aggregated_socket_event =
-      aggregated_socket_events_.find(channel_id)
-          ->second->aggregated_socket_event;
+      it->second->aggregated_socket_event;
   const net::IPAddressNumber& ip = cast_socket.ip_endpoint().address();
   aggregated_socket_event.set_endpoint_id(ip.back());
   aggregated_socket_event.set_channel_auth_type(cast_socket.channel_auth() ==
                                                         CHANNEL_AUTH_TYPE_SSL
                                                     ? proto::SSL
                                                     : proto::SSL_VERIFIED);
 }
 
 void Logger::LogSocketEvent(int channel_id, EventType event_type) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 15 matching lines @@
 
 void Logger::LogSocketEventWithRv(int channel_id,
                                   EventType event_type,
                                   int rv) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   SocketEvent event = CreateEvent(event_type);
   event.set_return_value(rv);
 
   LogSocketEvent(channel_id, event);
+
+  if ((event_type == proto::SOCKET_READ || event_type == proto::SOCKET_WRITE) &&
+      rv > 0) {
+    AggregatedSocketEventLogMap::iterator it =
+        aggregated_socket_events_.find(channel_id);
+    CHECK(it != aggregated_socket_events_.end());
+
+    AggregatedSocketEvent& aggregated_socket_event =
+        it->second->aggregated_socket_event;
+    if (event_type == proto::SOCKET_READ) {
+      aggregated_socket_event.set_bytes_read(
+          aggregated_socket_event.bytes_read() + rv);
+    } else {
+      aggregated_socket_event.set_bytes_written(
+          aggregated_socket_event.bytes_written() + rv);
+    }
+  }
 }
 
 void Logger::LogSocketReadyState(int channel_id, proto::ReadyState new_state) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   SocketEvent event = CreateEvent(proto::READY_STATE_CHANGED);
   event.set_ready_state(new_state);
 
   LogSocketEvent(channel_id, event);
 }
@@ skipping 71 matching lines @@
 }
 
 void Logger::LogSocketEvent(int channel_id, const SocketEvent& socket_event) {
   AggregatedSocketEventLogMap::iterator it =
       aggregated_socket_events_.find(channel_id);
   if (it == aggregated_socket_events_.end()) {
     if (aggregated_socket_events_.size() >= kMaxSocketsToLog) {
       AggregatedSocketEventLogMap::iterator erase_it =
           aggregated_socket_events_.begin();
 
-      num_evicted_aggregated_socket_events_++;
-      num_evicted_socket_events_ += erase_it->second->socket_events.size();
+      log_.set_num_evicted_aggregated_socket_events(
+          log_.num_evicted_aggregated_socket_events() + 1);
+      log_.set_num_evicted_socket_events(
+          log_.num_evicted_socket_events() +
+          erase_it->second->socket_events.size());
 
       aggregated_socket_events_.erase(erase_it);
     }
 
     it = aggregated_socket_events_
              .insert(std::make_pair(
                  channel_id, make_linked_ptr(new AggregatedSocketEventLog)))
              .first;
     it->second->aggregated_socket_event.set_id(channel_id);
   }
 
   std::deque<proto::SocketEvent>& socket_events = it->second->socket_events;
   if (socket_events.size() >= kMaxEventsPerSocket) {
     socket_events.pop_front();
-    num_evicted_socket_events_++;
+    log_.set_num_evicted_socket_events(log_.num_evicted_socket_events() + 1);
   }
 
   socket_events.push_back(socket_event);
 }
 
 bool Logger::LogToString(std::string* output) const {
   output->clear();
 
   Log log;
-  log.set_num_evicted_aggregated_socket_events(
-      num_evicted_aggregated_socket_events_);
-  log.set_num_evicted_socket_events(num_evicted_socket_events_);
+  log.CopyFrom(log_);

[Wez, 2014/08/14 18:44:35]

nit: This is just to get the evicted counts? Consider adding a comment to
clarify that this is just to copy across the "global" values.

[imcheng, 2014/08/14 22:43:19]

Done.

 
   for (AggregatedSocketEventLogMap::const_iterator it =
            aggregated_socket_events_.begin();
        it != aggregated_socket_events_.end();
        ++it) {
     AggregatedSocketEvent* new_aggregated_socket_event =
         log.add_aggregated_socket_event();
     new_aggregated_socket_event->CopyFrom(it->second->aggregated_socket_event);
 
     const std::deque<SocketEvent>& socket_events = it->second->socket_events;
     for (std::deque<SocketEvent>::const_iterator socket_event_it =
              socket_events.begin();
          socket_event_it != socket_events.end();
          ++socket_event_it) {
       SocketEvent* socket_event =
           new_aggregated_socket_event->add_socket_event();
       socket_event->CopyFrom(*socket_event_it);
     }
   }
 
   return log.SerializeToString(output);
 }
 
 void Logger::Reset() {
   aggregated_socket_events_.clear();
-  num_evicted_aggregated_socket_events_ = 0;
-  num_evicted_socket_events_ = 0;
+  log_.Clear();
 }
 
 }  // namespace cast_channel
 }  // namespace api
 }  // namespace extensions