trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [1/2] git commit: TS-2874 Make some of the SPDY metrics persistent
Date Wed, 04 Jun 2014 17:20:29 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 90ff1a790 -> 54db32b2d


TS-2874 Make some of the SPDY metrics persistent


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0e3035ea
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0e3035ea
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0e3035ea

Branch: refs/heads/master
Commit: 0e3035eae5078744a2be5523814a25d705cb5cc8
Parents: 90ff1a7
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Wed Jun 4 08:38:38 2014 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Wed Jun 4 08:38:38 2014 -0600

----------------------------------------------------------------------
 CHANGES                         | 3 +++
 proxy/spdy/SpdyClientSession.cc | 1 -
 proxy/spdy/SpdyCommon.cc        | 8 ++++----
 proxy/spdy/SpdyCommon.h         | 3 +--
 4 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0e3035ea/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 82b3204..1addfe4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-2874] Make some of the SPDY metrics persistent, and also fix how we
+   measure transaction time / total streams.
+
   *) [TS-2872] Can't set "Send Window" for SPDY/3.1 > 64k. Code mostly
    provided by our SPDY brainiac, Geffon.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0e3035ea/proxy/spdy/SpdyClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyClientSession.cc b/proxy/spdy/SpdyClientSession.cc
index e69f3bc..8ea8072 100644
--- a/proxy/spdy/SpdyClientSession.cc
+++ b/proxy/spdy/SpdyClientSession.cc
@@ -61,7 +61,6 @@ SpdyRequest::init(SpdyClientSession *sm, int id)
   start_time = TShrtime();
 
   SPDY_INCREMENT_THREAD_DYN_STAT(SPDY_STAT_CURRENT_CLIENT_STREAM_COUNT, sm->mutex->thread_holding);
-  SPDY_INCREMENT_THREAD_DYN_STAT(SPDY_STAT_TOTAL_CLIENT_STREAM_COUNT, sm->mutex->thread_holding);
 }
 
 void

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0e3035ea/proxy/spdy/SpdyCommon.cc
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyCommon.cc b/proxy/spdy/SpdyCommon.cc
index d14263b..db2fdc2 100644
--- a/proxy/spdy/SpdyCommon.cc
+++ b/proxy/spdy/SpdyCommon.cc
@@ -67,11 +67,11 @@ spdy_config_load()
                      static_cast<int>(SPDY_STAT_CURRENT_CLIENT_SESSION_COUNT), RecRawStatSyncSum);
   RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_CURRENT_CLIENT_STREAM_NAME, RECD_INT,
RECP_NON_PERSISTENT,
                      static_cast<int>(SPDY_STAT_CURRENT_CLIENT_STREAM_COUNT), RecRawStatSyncSum);
-  RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_TOTAL_CLIENT_STREAM_NAME, RECD_INT,
RECP_NON_PERSISTENT,
-                     static_cast<int>(SPDY_STAT_TOTAL_CLIENT_STREAM_COUNT), RecRawStatSyncSum);
-  RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_TOTAL_TRANSACTIONS_TIME_NAME, RECD_INT,
RECP_NON_PERSISTENT,
+  RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_TOTAL_CLIENT_STREAM_NAME, RECD_INT,
RECP_PERSISTENT,
+                     static_cast<int>(SPDY_STAT_TOTAL_TRANSACTIONS_TIME), RecRawStatSyncCount);
+  RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_TOTAL_TRANSACTIONS_TIME_NAME, RECD_INT,
RECP_PERSISTENT,
                      static_cast<int>(SPDY_STAT_TOTAL_TRANSACTIONS_TIME), RecRawStatSyncSum);
-  RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_TOTAL_CLIENT_CONNECTION_NAME, RECD_INT,
RECP_NON_PERSISTENT,
+  RecRegisterRawStat(spdy_rsb, RECT_PROCESS, SPDY_STAT_TOTAL_CLIENT_CONNECTION_NAME, RECD_INT,
RECP_PERSISTENT,
                      static_cast<int>(SPDY_STAT_TOTAL_CLIENT_CONNECTION_COUNT), RecRawStatSyncSum);
 
   return 0;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0e3035ea/proxy/spdy/SpdyCommon.h
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyCommon.h b/proxy/spdy/SpdyCommon.h
index 6b17c37..3425ad3 100644
--- a/proxy/spdy/SpdyCommon.h
+++ b/proxy/spdy/SpdyCommon.h
@@ -70,8 +70,7 @@ extern RecRawStatBlock* spdy_rsb;
 enum {
   SPDY_STAT_CURRENT_CLIENT_SESSION_COUNT, ///< Current # of active SPDY sessions.
   SPDY_STAT_CURRENT_CLIENT_STREAM_COUNT, ///< Current # of active SPDY streams.
-  SPDY_STAT_TOTAL_CLIENT_STREAM_COUNT, ///< Total number of streams created.
-  SPDY_STAT_TOTAL_TRANSACTIONS_TIME,  //< Total stream time
+  SPDY_STAT_TOTAL_TRANSACTIONS_TIME,  //< Total stream time and streams
   SPDY_STAT_TOTAL_CLIENT_CONNECTION_COUNT, //< Total connections running spdy
 
   SPDY_N_STATS ///< Terminal counter, NOT A STAT INDEX.


Mime
View raw message