You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by an...@apache.org on 2010/06/30 20:44:36 UTC
svn commit: r959405 - in /trafficserver/traffic/trunk/proxy/http2:
HttpClientSession.cc HttpConfig.cc HttpConfig.h
Author: andrewhsu
Date: Wed Jun 30 18:44:36 2010
New Revision: 959405
URL: http://svn.apache.org/viewvc?rev=959405&view=rev
Log:
TS-18 revert r953892
This reverts commit "TS-18 added stats for ipv4 and ipv6 request via
REC":
http://svn.apache.org/viewvc?view=rev&rev=r953892
The reverted changes will be moved to a branch called 'ipv6'.
Modified:
trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc
trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
trafficserver/traffic/trunk/proxy/http2/HttpConfig.h
Modified: trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc?rev=959405&r1=959404&r2=959405&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc Wed Jun 30 18:44:36 2010
@@ -207,24 +207,6 @@ HttpClientSession::new_connection(NetVCo
/* inbound requests stat should be incremented here, not after the
* header has been read */
HTTP_INCREMENT_DYN_STAT(http_total_incoming_connections_stat);
-
- // check what type of socket address we just accepted
- // by looking at the address family value of sockaddr_storage
- // and logging to stat system
- switch(new_vc->get_remote_addr().ss_family) {
- case AF_INET:
- HTTP_INCREMENT_DYN_STAT(http_total_client_connections_ipv4_stat);
- break;
- case AF_INET6:
- HTTP_INCREMENT_DYN_STAT(http_total_client_connections_ipv6_stat);
- break;
- default:
- // don't do anything if the address family is not ipv4 or ipv6
- // (there are many other address families in <sys/socket.h>
- // but we don't have a need to report on all the others today)
- break;
- }
-
// Record api hook set state
hooks_set = http_global_hooks->hooks_set;
Modified: trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc?rev=959405&r1=959404&r2=959405&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc Wed Jun 30 18:44:36 2010
@@ -198,14 +198,6 @@ register_stat_callbacks()
RECD_COUNTER, RECP_NULL, (int) http_total_client_connections_stat, RecRawStatSyncCount);
RecRegisterRawStat(http_rsb, RECT_PROCESS,
- "proxy.process.http.total_client_connections_ipv4",
- RECD_COUNTER, RECP_NULL, (int) http_total_client_connections_ipv4_stat, RecRawStatSyncCount);
-
- RecRegisterRawStat(http_rsb, RECT_PROCESS,
- "proxy.process.http.total_client_connections_ipv6",
- RECD_COUNTER, RECP_NULL, (int) http_total_client_connections_ipv6_stat, RecRawStatSyncCount);
-
- RecRegisterRawStat(http_rsb, RECT_PROCESS,
"proxy.process.http.total_server_connections",
RECD_COUNTER, RECP_NULL, (int) http_total_server_connections_stat, RecRawStatSyncCount);
Modified: trafficserver/traffic/trunk/proxy/http2/HttpConfig.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpConfig.h?rev=959405&r1=959404&r2=959405&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpConfig.h (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpConfig.h Wed Jun 30 18:44:36 2010
@@ -83,14 +83,7 @@ enum
http_ua_msecs_counts_errors_early_hangups_stat,
// Http Total Connections Stats
- //
- // it is assumed that this inequality will always be satisifed:
- // http_total_client_connections_stat >=
- // http_total_client_connections_ipv4_stat +
- // http_total_client_connections_ipv6_stat
http_total_client_connections_stat,
- http_total_client_connections_ipv4_stat,
- http_total_client_connections_ipv6_stat,
http_total_server_connections_stat,
http_total_parent_proxy_connections_stat,
http_current_parent_proxy_connections_stat,