You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by er...@apache.org on 2010/11/19 03:14:21 UTC
svn commit: r1036712 - in /trafficserver/traffic/trunk/proxy/http2:
HttpConfig.cc HttpConfig.h HttpTransact.cc HttpTransact.h
Author: ericb
Date: Fri Nov 19 02:14:21 2010
New Revision: 1036712
URL: http://svn.apache.org/viewvc?rev=1036712&view=rev
Log:
remove random AOL stuff
Modified:
trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
trafficserver/traffic/trunk/proxy/http2/HttpConfig.h
trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
trafficserver/traffic/trunk/proxy/http2/HttpTransact.h
Modified: trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc?rev=1036712&r1=1036711&r2=1036712&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc Fri Nov 19 02:14:21 2010
@@ -817,28 +817,6 @@ register_stat_callbacks()
"proxy.process.http.cache_read_errors",
RECD_INT, RECP_NULL, (int) http_cache_read_errors, RecRawStatSyncSum);
- ////////////////////////
- // JG Specific Stats //
- ////////////////////////
- RecRegisterRawStat(http_rsb, RECT_PROCESS,
- "proxy.process.http.jg_cache_hits_stat",
- RECD_INT, RECP_NULL, (int) http_jg_cache_hits_stat, RecRawStatSyncSum);
-
- RecRegisterRawStat(http_rsb, RECT_PROCESS,
- "proxy.process.http.jg_cache_misses_stat",
- RECD_INT, RECP_NULL, (int) http_jg_cache_misses_stat, RecRawStatSyncSum);
-
- RecRegisterRawStat(http_rsb, RECT_PROCESS,
- "proxy.process.http.jg_client_aborts_stat",
- RECD_INT, RECP_NULL, (int) http_jg_client_aborts_stat, RecRawStatSyncSum);
-
- RecRegisterRawStat(http_rsb, RECT_PROCESS,
- "proxy.process.http.jg_cache_hit_time_stat",
- RECD_INT, RECP_NULL, (int) http_jg_cache_hit_time_stat, RecRawStatSyncSum);
-
- RecRegisterRawStat(http_rsb, RECT_PROCESS,
- "proxy.process.http.jg_cache_miss_time_stat",
- RECD_INT, RECP_NULL, (int) http_jg_cache_miss_time_stat, RecRawStatSyncSum);
////////////////////////////////////////////////////////////////////////////////
// status code counts
////////////////////////////////////////////////////////////////////////////////
Modified: trafficserver/traffic/trunk/proxy/http2/HttpConfig.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpConfig.h?rev=1036712&r1=1036711&r2=1036712&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpConfig.h (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpConfig.h Fri Nov 19 02:14:21 2010
@@ -292,13 +292,6 @@ enum
http_cache_write_errors,
http_cache_read_errors,
- // jg specific stats
- http_jg_cache_hits_stat,
- http_jg_cache_misses_stat,
- http_jg_client_aborts_stat,
- http_jg_cache_hit_time_stat,
- http_jg_cache_miss_time_stat,
-
// status code stats
http_response_status_100_count_stat,
http_response_status_101_count_stat,
Modified: trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc?rev=1036712&r1=1036711&r2=1036712&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc Fri Nov 19 02:14:21 2010
@@ -9015,53 +9015,6 @@ HttpTransact::origin_server_connection_s
}
void
-HttpTransact::update_aol_stats(State * s, ink_hrtime cache_lookup_time)
-{
-#ifndef TS_MICRO
- // Interested in stats about JG compressed images. First
- // check the port attribute for a fast path when we are not
- // doing jg compression as the integer compare is much cheaper
- // than a header fetch & string compare
- //
- if (s->client_info.port_attribute == SERVER_PORT_COMPRESSED && s->hdr_info.client_response.valid()) {
-
- int cont_type_len;
- const char *cont_type_str = s->hdr_info.client_response.value_get(MIME_FIELD_CONTENT_TYPE,
- MIME_LEN_CONTENT_TYPE,
- &cont_type_len);
-
- // This is how we will determine that this was a "JG" request.
- if (cont_type_str && (ptr_len_casecmp(cont_type_str, cont_type_len, "image/x-jg") == 0)) {
-
- if (s->squid_codes.wuts_proxy_status_code ==
- WUTS_PROXY_STATUS_CLIENT_ABORT ||
- s->squid_codes.log_code == SQUID_LOG_ERR_CLIENT_ABORT ||
- s->squid_codes.wuts_proxy_status_code ==
- WUTS_PROXY_STATUS_SPIDER_MEMBER_ABORTED || s->squid_codes.log_code == SQUID_LOG_ERR_SPIDER_MEMBER_ABORTED) {
- HTTP_INCREMENT_TRANS_STAT(http_jg_client_aborts_stat);
- }
-
- if (s->squid_codes.log_code == SQUID_LOG_TCP_HIT ||
- s->squid_codes.log_code == SQUID_LOG_TCP_MEM_HIT ||
- s->squid_codes.log_code == SQUID_LOG_TCP_REFRESH_HIT || s->squid_codes.log_code == SQUID_LOG_TCP_IMS_HIT) {
- HTTP_INCREMENT_TRANS_STAT(http_jg_cache_hits_stat);
- if (cache_lookup_time > 0) {
- HTTP_SUM_TRANS_STAT(http_jg_cache_hit_time_stat, cache_lookup_time);
- }
- } else {
- HTTP_INCREMENT_TRANS_STAT(http_jg_cache_misses_stat);
- if (cache_lookup_time > 0) {
- HTTP_SUM_TRANS_STAT(http_jg_cache_miss_time_stat, cache_lookup_time);
- }
- }
- }
-
- }
-#endif
-}
-
-
-void
HttpTransact::update_size_and_time_stats(State * s, ink_hrtime total_time, ink_hrtime user_agent_write_time,
ink_hrtime origin_server_read_time, ink_hrtime cache_lookup_time,
int user_agent_request_header_size, int64 user_agent_request_body_size,
@@ -9209,8 +9162,6 @@ HttpTransact::update_size_and_time_stats
origin_server_connection_speed(s, origin_server_read_time, origin_server_response_size);
}
- update_aol_stats(s, cache_lookup_time);
-
return;
}
Modified: trafficserver/traffic/trunk/proxy/http2/HttpTransact.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpTransact.h?rev=1036712&r1=1036711&r2=1036712&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpTransact.h (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpTransact.h Fri Nov 19 02:14:21 2010
@@ -1407,7 +1407,6 @@ public:
int origin_server_request_header_size, int64 origin_server_request_body_size,
int origin_server_response_header_size, int64 origin_server_response_body_size,
int pushed_response_header_size, int64 pushed_response_body_size, CacheAction_t cache_action);
- static void update_aol_stats(State * s, ink_hrtime cache_lookup_time);
static void histogram_request_document_size(State * s, int64 size);
static void histogram_response_document_size(State * s, int64 size);
static void user_agent_connection_speed(State * s, ink_hrtime transfer_time, int64 nbytes);