TS-2857: Cleanup SPDY and SSL stat names
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f6e9da4a Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f6e9da4a Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f6e9da4a Branch: refs/heads/5.0.x Commit: f6e9da4aa2ec5e2ad96b1ebc3f34ee20bb7afbef Parents: 2ddcc68 Author: Bryan Call <[email protected]> Authored: Wed May 28 21:28:42 2014 -0700 Committer: Bryan Call <[email protected]> Committed: Wed May 28 21:28:42 2014 -0700 ---------------------------------------------------------------------- proxy/spdy/SpdyClientSession.cc | 2 +- proxy/spdy/SpdyCommon.cc | 4 ++-- proxy/spdy/SpdyCommon.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f6e9da4a/proxy/spdy/SpdyClientSession.cc ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyClientSession.cc b/proxy/spdy/SpdyClientSession.cc index cec15e6..331362c 100644 --- a/proxy/spdy/SpdyClientSession.cc +++ b/proxy/spdy/SpdyClientSession.cc @@ -399,7 +399,7 @@ spdy_read_fetch_body_callback(spdylay_session * /*session*/, int32_t stream_id, if (already < (int64_t)length) { if (req->event == TS_FETCH_EVENT_EXT_BODY_DONE) { TSHRTime end_time = TShrtime(); - SpdyStatIncr(Config::STAT_TOTAL_STREAM_TIME, sm, end_time - req->start_time); + SpdyStatIncr(Config::STAT_TOTAL_TRANSACTIONS_TIME, sm, end_time - req->start_time); Debug("spdy", "----Request[%" PRIu64 ":%d] %s %lld %d", sm->sm_id, req->stream_id, req->url.c_str(), (end_time - req->start_time)/TS_HRTIME_MSECOND, req->fetch_data_len); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f6e9da4a/proxy/spdy/SpdyCommon.cc ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyCommon.cc b/proxy/spdy/SpdyCommon.cc index 3eb01c4..2adabdb 100644 --- a/proxy/spdy/SpdyCommon.cc +++ b/proxy/spdy/SpdyCommon.cc @@ -30,7 +30,7 @@ Config SPDY_CFG; static char const * const SPDY_STAT_CURRENT_CLIENT_SESSION_NAME = "proxy.process.spdy.current_client_sessions"; static char const * const SPDY_STAT_CURRENT_CLIENT_STREAM_NAME = "proxy.process.spdy.current_client_streams"; static char const * const SPDY_STAT_TOTAL_CLIENT_STREAM_NAME = "proxy.process.spdy.total_client_streams"; -static char const * const SPDY_STAT_TOTAL_TIME_NAME = "proxy.process.spdy.total_time"; +static char const * const SPDY_STAT_TOTAL_TRANSACTIONS_TIME_NAME = "proxy.process.spdy.total_transactions_time"; static char const * const SPDY_STAT_TOTAL_CLIENT_CONNECTION_NAME = "proxy.process.spdy.total_client_connections"; string @@ -57,7 +57,7 @@ spdy_config_load() RecRegisterRawStat(SPDY_CFG.rsb, RECT_PROCESS, SPDY_STAT_CURRENT_CLIENT_SESSION_NAME, RECD_INT, RECP_NON_PERSISTENT, static_cast<int>(Config::STAT_CURRENT_CLIENT_SESSION_COUNT), RecRawStatSyncCount); RecRegisterRawStat(SPDY_CFG.rsb, RECT_PROCESS, SPDY_STAT_CURRENT_CLIENT_STREAM_NAME, RECD_INT, RECP_NON_PERSISTENT, static_cast<int>(Config::STAT_CURRENT_CLIENT_STREAM_COUNT), RecRawStatSyncCount); RecRegisterRawStat(SPDY_CFG.rsb, RECT_PROCESS, SPDY_STAT_TOTAL_CLIENT_STREAM_NAME, RECD_INT, RECP_NON_PERSISTENT, static_cast<int>(Config::STAT_TOTAL_CLIENT_STREAM_COUNT), RecRawStatSyncCount); - RecRegisterRawStat(SPDY_CFG.rsb, RECT_PROCESS, SPDY_STAT_TOTAL_TIME_NAME, RECD_INT, RECP_NON_PERSISTENT, static_cast<int>(Config::STAT_TOTAL_STREAM_TIME), RecRawStatSyncSum); + RecRegisterRawStat(SPDY_CFG.rsb, RECT_PROCESS, SPDY_STAT_TOTAL_TRANSACTIONS_TIME_NAME, RECD_INT, RECP_NON_PERSISTENT, static_cast<int>(Config::STAT_TOTAL_TRANSACTIONS_TIME), RecRawStatSyncSum); RecRegisterRawStat(SPDY_CFG.rsb, RECT_PROCESS, SPDY_STAT_TOTAL_CLIENT_CONNECTION_NAME, RECD_INT, RECP_NON_PERSISTENT, static_cast<int>(Config::STAT_TOTAL_CLIENT_CONNECTION_COUNT), RecRawStatSyncCount); return 0; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f6e9da4a/proxy/spdy/SpdyCommon.h ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyCommon.h b/proxy/spdy/SpdyCommon.h index f772d06..61a8234 100644 --- a/proxy/spdy/SpdyCommon.h +++ b/proxy/spdy/SpdyCommon.h @@ -72,7 +72,7 @@ struct Config { STAT_CURRENT_CLIENT_SESSION_COUNT, ///< Current # of active SPDY sessions. STAT_CURRENT_CLIENT_STREAM_COUNT, ///< Current # of active SPDY streams. STAT_TOTAL_CLIENT_STREAM_COUNT, ///< Total number of streams created. - STAT_TOTAL_STREAM_TIME, //< Total stream time + STAT_TOTAL_TRANSACTIONS_TIME, //< Total stream time STAT_TOTAL_CLIENT_CONNECTION_COUNT, //< Total connections running spdy N_STATS ///< Terminal counter, NOT A STAT INDEX.
