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/03/12 00:18:14 UTC
svn commit: r922061 - in /incubator/trafficserver/traffic/trunk/proxy:
InkAPI.cc http2/HttpSM.cc http2/HttpTransact.cc http2/HttpTransact.h
Author: ericb
Date: Thu Mar 11 23:18:14 2010
New Revision: 922061
URL: http://svn.apache.org/viewvc?rev=922061&view=rev
Log:
TS-239: Remove 4 non-essential booleans from transaction state
Modified:
incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc
incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.h
Modified: incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=922061&r1=922060&r2=922061&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc Thu Mar 11 23:18:14 2010
@@ -5623,7 +5623,6 @@ INKHttpTxnActiveTimeoutSet(INKHttpTxn tx
{
Debug("http_timeout", "setting active timeout to %d msec via API", timeout);
HttpTransact::State * s = &(((HttpSM *) txnp)->t_state);
- s->api_txn_active_timeout = true;
s->api_txn_active_timeout_value = timeout;
return 1;
}
@@ -5637,7 +5636,6 @@ INKHttpTxnConnectTimeoutSet(INKHttpTxn t
{
Debug("http_timeout", "setting inactive timeout to %d msec via API", timeout);
HttpTransact::State * s = &(((HttpSM *) txnp)->t_state);
- s->api_txn_connect_timeout = true;
s->api_txn_connect_timeout_value = timeout;
return 1;
}
@@ -5651,7 +5649,6 @@ INKHttpTxnDNSTimeoutSet(INKHttpTxn txnp,
{
Debug("http_timeout", "setting DNS timeout to %d msec via API", timeout);
HttpTransact::State * s = &(((HttpSM *) txnp)->t_state);
- s->api_txn_dns_timeout = true;
s->api_txn_dns_timeout_value = timeout;
return 1;
}
@@ -5666,7 +5663,6 @@ INKHttpTxnNoActivityTimeoutSet(INKHttpTx
{
Debug("http_timeout", "setting DNS timeout to %d msec via API", timeout);
HttpTransact::State * s = &(((HttpSM *) txnp)->t_state);
- s->api_txn_no_activity_timeout = true;
s->api_txn_no_activity_timeout_value = timeout;
return 1;
}
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc?rev=922061&r1=922060&r2=922061&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc Thu Mar 11 23:18:14 2010
@@ -1928,11 +1928,10 @@ HttpSM::state_read_server_response_heade
if (server_response_hdr_bytes == 0) {
milestones.server_first_read = ink_get_hrtime();
- if (t_state.api_txn_no_activity_timeout) {
+ if (t_state.api_txn_no_activity_timeout_value != -1) {
server_session->get_netvc()->set_inactivity_timeout(HRTIME_MSECONDS(t_state.api_txn_no_activity_timeout_value));
} else {
- server_session->get_netvc()->
- set_inactivity_timeout(HRTIME_SECONDS(t_state.http_config_param->transaction_no_activity_timeout_out));
+ server_session->get_netvc()->set_inactivity_timeout(HRTIME_SECONDS(t_state.http_config_param->transaction_no_activity_timeout_out));
}
// For requests that contain a body, we can cancel the ua inactivity timeout.
@@ -2186,7 +2185,7 @@ lookup:
HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::state_hostdb_lookup);
- if (t_state.api_txn_dns_timeout) {
+ if (t_state.api_txn_dns_timeout_value != -1) {
Debug("http_timeout", "beginning DNS lookup. allowing %d mseconds for DNS", t_state.api_txn_dns_timeout_value);
}
@@ -2199,7 +2198,7 @@ lookup:
does_client_permit_dns_storing) ? HostDBProcessor::
HOSTDB_DO_NOT_FORCE_DNS : HostDBProcessor::
HOSTDB_FORCE_DNS_RELOAD),
- t_state.api_txn_dns_timeout ? t_state.
+ (t_state.api_txn_dns_timeout_value != -1) ? t_state.
api_txn_dns_timeout_value : 0);
@@ -2250,7 +2249,7 @@ HttpSM::process_hostdb_info(HostDBInfo *
milestones.dns_lookup_end = ink_get_hrtime();
- if (t_state.api_txn_dns_timeout) {
+ if (t_state.api_txn_dns_timeout_value != -1) {
int foo = (int) (milestone_difference_msec(milestones.dns_lookup_begin, milestones.dns_lookup_end));
Debug("http_timeout", "DNS took: %d msec", foo);
}
@@ -4040,7 +4039,7 @@ HttpSM::do_hostdb_lookup()
(process_srv_info_pfn) & HttpSM::
process_srv_info,
(char *) s.c_str(),
- t_state.api_txn_dns_timeout ? t_state.
+ (t_state.api_txn_dns_timeout_value != -1) ? t_state.
api_txn_dns_timeout_value : 0);
if (srv_lookup_action_handle != ACTION_RESULT_DONE) {
@@ -4056,7 +4055,7 @@ HttpSM::do_hostdb_lookup()
// server at the beginning of the transaction
int server_port = t_state.current.server ? t_state.current.server->port : t_state.server_info.port;
- if (t_state.api_txn_dns_timeout) {
+ if (t_state.api_txn_dns_timeout_value != -1) {
Debug("http_timeout", "beginning DNS lookup. allowing %d mseconds for DNS lookup",
t_state.api_txn_dns_timeout_value);
}
@@ -4071,7 +4070,7 @@ HttpSM::do_hostdb_lookup()
HostDBProcessor::
HOSTDB_DO_NOT_FORCE_DNS : HostDBProcessor::
HOSTDB_FORCE_DNS_RELOAD),
- t_state.api_txn_dns_timeout ? t_state.
+ (t_state.api_txn_dns_timeout_value != -1) ? t_state.
api_txn_dns_timeout_value : 0);
if (dns_lookup_action_handle != ACTION_RESULT_DONE) {
@@ -5796,17 +5795,16 @@ HttpSM::attach_server_session(HttpServer
if (t_state.pCongestionEntry != NULL)
connect_timeout = t_state.pCongestionEntry->connect_timeout();
- if (t_state.api_txn_connect_timeout) {
+ if (t_state.api_txn_connect_timeout_value != -1) {
server_session->get_netvc()->set_inactivity_timeout(HRTIME_MSECONDS(t_state.api_txn_connect_timeout_value));
} else {
server_session->get_netvc()->set_inactivity_timeout(HRTIME_SECONDS(connect_timeout));
}
- if (t_state.api_txn_active_timeout) {
+ if (t_state.api_txn_active_timeout_value != -1) {
server_session->get_netvc()->set_active_timeout(HRTIME_MSECONDS(t_state.api_txn_active_timeout_value));
} else {
- server_session->get_netvc()->
- set_active_timeout(HRTIME_SECONDS(t_state.http_config_param->transaction_active_timeout_out));
+ server_session->get_netvc()->set_active_timeout(HRTIME_SECONDS(t_state.http_config_param->transaction_active_timeout_out));
}
if (plugin_tunnel_type != HTTP_NO_PLUGIN_TUNNEL) {
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc?rev=922061&r1=922060&r2=922061&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc Thu Mar 11 23:18:14 2010
@@ -8929,14 +8929,14 @@ HttpTransact::handle_server_died(State *
body_type = "connect#hangup";
break;
case ACTIVE_TIMEOUT:
- if (s->api_txn_active_timeout)
+ if (s->api_txn_active_timeout_value != -1)
Debug("http_timeout", "Maximum active time of %d msec exceeded", s->api_txn_active_timeout_value);
status = HTTP_STATUS_GATEWAY_TIMEOUT;
reason = "Maximum Transaction Time Exceeded";
body_type = "timeout#activity";
break;
case INACTIVE_TIMEOUT:
- if (s->api_txn_connect_timeout)
+ if (s->api_txn_connect_timeout_value != -1)
Debug("http_timeout", "Maximum connect time of %d msec exceeded", s->api_txn_connect_timeout_value);
status = HTTP_STATUS_GATEWAY_TIMEOUT;
reason = "Connection Timed Out";
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.h?rev=922061&r1=922060&r2=922061&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.h Thu Mar 11 23:18:14 2010
@@ -1086,16 +1086,12 @@ public:
char return_xbuf[HTTP_TRANSACT_STATE_MAX_XBUF_SIZE];
void *user_args[HTTP_TRANSACT_STATE_MAX_USER_ARG];
- bool api_txn_active_timeout;
int api_txn_active_timeout_value;
- bool api_txn_connect_timeout;
int api_txn_connect_timeout_value;
- bool api_txn_dns_timeout;
int api_txn_dns_timeout_value;
- bool api_txn_no_activity_timeout;
int api_txn_no_activity_timeout_value;
// Used by INKHttpTxnCachedReqGet and INKHttpTxnCachedRespGet SDK functions
@@ -1434,14 +1430,10 @@ remap_plugin_instance(0),
http_return_code(HTTP_STATUS_NONE),
return_xbuf_size(0),
return_xbuf_plain(false),
-api_txn_active_timeout(false),
-api_txn_active_timeout_value(0),
-api_txn_connect_timeout(false),
-api_txn_connect_timeout_value(0),
-api_txn_dns_timeout(false),
-api_txn_dns_timeout_value(0),
-api_txn_no_activity_timeout(false),
-api_txn_no_activity_timeout_value(0),
+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_release_server_session(false),