SPDY PING - log the type of PING if it is received

net/spdy/spdy_session.cc

 // Copyright (c) 2011 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 "net/spdy/spdy_session.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/message_loop.h"
@@ skipping 157 matching lines @@
  private:
   ~NetLogSpdyRstParameter() {}
   const spdy::SpdyStreamId stream_id_;
   const int status_;
 
   DISALLOW_COPY_AND_ASSIGN(NetLogSpdyRstParameter);
 };
 
 class NetLogSpdyPingParameter : public NetLog::EventParameters {
  public:
-  explicit NetLogSpdyPingParameter(uint32 unique_id) : unique_id_(unique_id) {}
+  explicit NetLogSpdyPingParameter(uint32 unique_id, const std::string& type)
+    : unique_id_(unique_id),
+      type_(type) {}
 
   virtual Value* ToValue() const {
     DictionaryValue* dict = new DictionaryValue();
     dict->SetInteger("unique_id", unique_id_);
+    dict->SetString("type", type_);
     return dict;
   }
 
  private:
   ~NetLogSpdyPingParameter() {}
   const uint32 unique_id_;
+  const std::string type_;
 
   DISALLOW_COPY_AND_ASSIGN(NetLogSpdyPingParameter);
 };
 
 class NetLogSpdyGoAwayParameter : public NetLog::EventParameters {
  public:
   NetLogSpdyGoAwayParameter(spdy::SpdyStreamId last_stream_id,
                             int active_streams,
                             int unclaimed_streams)
       : last_stream_id_(last_stream_id),
@@ skipping 1176 matching lines @@
   // |last_accepted_stream_id|.
 
   // Don't bother killing any streams that are still reading.  They'll either
   // complete successfully or get an ERR_CONNECTION_CLOSED when the socket is
   // closed.
 }
 
 void SpdySession::OnPing(const spdy::SpdyPingControlFrame& frame) {
   net_log_.AddEvent(
       NetLog::TYPE_SPDY_SESSION_PING,
-      make_scoped_refptr(new NetLogSpdyPingParameter(frame.unique_id())));
+      make_scoped_refptr(
+          new NetLogSpdyPingParameter(frame.unique_id(), "received")));
 
   // Send response to a PING from server.
   if (frame.unique_id() % 2 == 0) {
     WritePingFrame(frame.unique_id());
     return;
   }
 
   --pings_in_flight_;
   if (pings_in_flight_ < 0) {
     CloseSessionOnError(net::ERR_SPDY_PROTOCOL_ERROR, true);
@@ skipping 190 matching lines @@
 }
 
 void SpdySession::WritePingFrame(uint32 unique_id) {
   scoped_ptr<spdy::SpdyPingControlFrame> ping_frame(
       spdy_framer_.CreatePingFrame(next_ping_id_));
   QueueFrame(ping_frame.get(), SPDY_PRIORITY_HIGHEST, NULL);
 
   if (net_log().IsLoggingAllEvents()) {
     net_log().AddEvent(
         NetLog::TYPE_SPDY_SESSION_PING,
-        make_scoped_refptr(new NetLogSpdyPingParameter(next_ping_id_)));
+        make_scoped_refptr(new NetLogSpdyPingParameter(next_ping_id_, "sent")));
   }
   if (unique_id % 2 != 0) {
     next_ping_id_ += 2;
     ++pings_in_flight_;
     need_to_send_ping_ = false;
     PlanToCheckPingStatus();
     last_ping_sent_time_ = base::TimeTicks::Now();
   }
 }
 
@@ skipping 126 matching lines @@
   if (it == pending_callback_map_.end())
     return;
 
   OldCompletionCallback* callback = it->second.callback;
   int result = it->second.result;
   pending_callback_map_.erase(it);
   callback->Run(result);
 }
 
 }  // namespace net