You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2016/03/09 05:38:23 UTC
trafficserver git commit: TS-4255: Format.
Repository: trafficserver
Updated Branches:
refs/heads/master 896282b5b -> 954deaf3c
TS-4255: Format.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/954deaf3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/954deaf3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/954deaf3
Branch: refs/heads/master
Commit: 954deaf3c2b55ef3dce2f67f5c033cadad442422
Parents: 896282b
Author: James Peach <jp...@apache.org>
Authored: Tue Mar 8 20:38:04 2016 -0800
Committer: James Peach <jp...@apache.org>
Committed: Tue Mar 8 20:38:04 2016 -0800
----------------------------------------------------------------------
proxy/http/HttpTransact.cc | 32 ++++++++++++++++----------------
proxy/http/HttpTransact.h | 18 +++++++++---------
2 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/954deaf3/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 3b096f0..b5a63c7 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -8836,9 +8836,9 @@ HttpTransact::update_size_and_time_stats(State *s, ink_hrtime total_time, ink_hr
// proxy stats
if (s->current.request_to == HttpTransact::PARENT_PROXY) {
HTTP_SUM_DYN_STAT(http_parent_proxy_request_total_bytes_stat,
- origin_server_request_header_size + origin_server_request_body_size);
+ origin_server_request_header_size + origin_server_request_body_size);
HTTP_SUM_DYN_STAT(http_parent_proxy_response_total_bytes_stat,
- origin_server_response_header_size + origin_server_response_body_size);
+ origin_server_response_header_size + origin_server_response_body_size);
HTTP_SUM_DYN_STAT(http_parent_proxy_transaction_time_stat, total_time);
}
// request header zero means the document was cached.
@@ -8875,65 +8875,65 @@ HttpTransact::update_size_and_time_stats(State *s, ink_hrtime total_time, ink_hr
}
if (http_ua_read_header_done_time_stat) {
HTTP_SUM_DYN_STAT(http_ua_read_header_done_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_READ_HEADER_DONE));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_READ_HEADER_DONE));
}
if (http_ua_begin_write_time_stat) {
HTTP_SUM_DYN_STAT(http_ua_begin_write_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_BEGIN_WRITE));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_BEGIN_WRITE));
}
if (http_ua_close_time_stat) {
HTTP_SUM_DYN_STAT(http_ua_close_time_stat, milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_CLOSE));
}
if (http_server_first_connect_time_stat) {
HTTP_SUM_DYN_STAT(http_server_first_connect_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_FIRST_CONNECT));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_FIRST_CONNECT));
}
if (http_server_connect_time_stat) {
HTTP_SUM_DYN_STAT(http_server_connect_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CONNECT));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CONNECT));
}
if (http_server_connect_end_time_stat) {
HTTP_SUM_DYN_STAT(http_server_connect_end_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CONNECT_END));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CONNECT_END));
}
if (http_server_begin_write_time_stat) {
HTTP_SUM_DYN_STAT(http_server_begin_write_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_BEGIN_WRITE));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_BEGIN_WRITE));
}
if (http_server_first_read_time_stat) {
HTTP_SUM_DYN_STAT(http_server_first_read_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_FIRST_READ));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_FIRST_READ));
}
if (http_server_read_header_done_time_stat) {
HTTP_SUM_DYN_STAT(http_server_read_header_done_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_READ_HEADER_DONE));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_READ_HEADER_DONE));
}
if (http_server_close_time_stat) {
HTTP_SUM_DYN_STAT(http_server_close_time_stat, milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CLOSE));
}
if (http_cache_open_read_begin_time_stat) {
HTTP_SUM_DYN_STAT(http_cache_open_read_begin_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_READ_BEGIN));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_READ_BEGIN));
}
if (http_cache_open_read_end_time_stat) {
HTTP_SUM_DYN_STAT(http_cache_open_read_end_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_READ_END));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_READ_END));
}
if (http_cache_open_write_begin_time_stat) {
HTTP_SUM_DYN_STAT(http_cache_open_write_begin_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_WRITE_BEGIN));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_WRITE_BEGIN));
}
if (http_cache_open_write_end_time_stat) {
HTTP_SUM_DYN_STAT(http_cache_open_write_end_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_WRITE_END));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_WRITE_END));
}
if (http_dns_lookup_begin_time_stat) {
HTTP_SUM_DYN_STAT(http_dns_lookup_begin_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_DNS_LOOKUP_BEGIN));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_DNS_LOOKUP_BEGIN));
}
if (http_dns_lookup_end_time_stat) {
HTTP_SUM_DYN_STAT(http_dns_lookup_end_time_stat,
- milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_DNS_LOOKUP_END));
+ milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_DNS_LOOKUP_END));
}
if (http_sm_start_time_stat) {
HTTP_SUM_DYN_STAT(http_sm_start_time_stat, milestones.difference_msec(TS_MILESTONE_SM_START, TS_MILESTONE_SM_START));
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/954deaf3/proxy/http/HttpTransact.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index cb4bfb6..17e9d0b 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -953,15 +953,15 @@ public:
internal_msg_buffer_size(0), internal_msg_buffer_fast_allocator_size(-1), icp_lookup_success(false), scheme(-1),
next_hop_scheme(scheme), orig_scheme(scheme), method(0), cause_of_death_errno(-UNKNOWN_INTERNAL_ERROR),
client_request_time(UNDEFINED_TIME), request_sent_time(UNDEFINED_TIME), response_received_time(UNDEFINED_TIME),
- plugin_set_expire_time(UNDEFINED_TIME), state_machine_id(0),
- client_connection_enabled(true), acl_filtering_performed(false), negative_caching(false), srv_lookup(false),
- www_auth_content(CACHE_AUTH_NONE), remap_plugin_instance(0), fp_tsremap_os_response(NULL),
- http_return_code(HTTP_STATUS_NONE), api_txn_active_timeout_value(-1), api_txn_connect_timeout_value(-1),
- api_txn_dns_timeout_value(-1), api_txn_no_activity_timeout_value(-1), cache_req_hdr_heap_handle(NULL),
- cache_resp_hdr_heap_handle(NULL), api_cleanup_cache_read(false), api_server_response_no_store(false),
- api_server_response_ignore(false), api_http_sm_shutdown(false), api_modifiable_cached_resp(false),
- api_server_request_body_set(false), api_req_cacheable(false), api_resp_cacheable(false), api_server_addr_set(false),
- stale_icp_lookup(false), api_update_cached_object(UPDATE_CACHED_OBJECT_NONE), api_lock_url(LOCK_URL_FIRST),
+ plugin_set_expire_time(UNDEFINED_TIME), state_machine_id(0), client_connection_enabled(true),
+ acl_filtering_performed(false), negative_caching(false), srv_lookup(false), www_auth_content(CACHE_AUTH_NONE),
+ remap_plugin_instance(0), fp_tsremap_os_response(NULL), http_return_code(HTTP_STATUS_NONE),
+ api_txn_active_timeout_value(-1), api_txn_connect_timeout_value(-1), api_txn_dns_timeout_value(-1),
+ api_txn_no_activity_timeout_value(-1), cache_req_hdr_heap_handle(NULL), cache_resp_hdr_heap_handle(NULL),
+ api_cleanup_cache_read(false), api_server_response_no_store(false), api_server_response_ignore(false),
+ api_http_sm_shutdown(false), api_modifiable_cached_resp(false), api_server_request_body_set(false),
+ api_req_cacheable(false), api_resp_cacheable(false), api_server_addr_set(false), stale_icp_lookup(false),
+ api_update_cached_object(UPDATE_CACHED_OBJECT_NONE), api_lock_url(LOCK_URL_FIRST),
saved_update_next_action(SM_ACTION_UNDEFINED), saved_update_cache_action(CACHE_DO_UNDEFINED), url_map(),
pCongestionEntry(NULL), congest_saved_next_action(SM_ACTION_UNDEFINED), congestion_control_crat(0),
congestion_congested_or_failed(0), congestion_connection_opened(0), filter_mask(0), remap_redirect(NULL),