You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/04/20 21:20:59 UTC
[42/50] [abbrv] TS-2660: rename StateMachineAction_t values with a
consistent prefix
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/70599abf/proxy/http/HttpTransact.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index 636a81e..b712b63 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -457,67 +457,61 @@ public:
////////////////////////////////////////////////
enum StateMachineAction_t
{
- STATE_MACHINE_ACTION_UNDEFINED = 0,
-
- DNS_LOOKUP,
- REVERSE_DNS_LOOKUP,
- //AUTH_LOOKUP,
-
- CACHE_LOOKUP,
- CACHE_ISSUE_WRITE,
- CACHE_ISSUE_WRITE_TRANSFORM,
- ISSUE_CACHE_DELETE,
- PREPARE_CACHE_UPDATE,
- ISSUE_CACHE_UPDATE,
-
- ICP_QUERY,
-
- ORIGIN_SERVER_OPEN,
- ORIGIN_SERVER_RAW_OPEN,
- OS_RR_MARK_DOWN,
-
- READ_PUSH_HDR,
- STORE_PUSH_BODY,
-
- PROXY_INTERNAL_CACHE_DELETE,
- PROXY_INTERNAL_CACHE_NOOP,
- PROXY_INTERNAL_CACHE_UPDATE_HEADERS,
- PROXY_INTERNAL_CACHE_WRITE,
- PROXY_INTERNAL_100_RESPONSE,
- PROXY_INTERNAL_REQUEST,
- PROXY_SEND_ERROR_CACHE_NOOP,
-#ifdef PROXY_DRAIN
- PROXY_DRAIN_REQUEST_BODY,
-#endif /* PROXY_DRAIN */
+ SM_ACTION_UNDEFINED = 0,
- SEND_QUERY_TO_INCOMING_ROUTER,
- SERVE_FROM_CACHE,
- SERVER_READ,
- SERVER_PARSE_NEXT_HDR,
- TRANSFORM_READ,
+ // SM_ACTION_AUTH_LOOKUP,
+ SM_ACTION_DNS_LOOKUP,
+ SM_ACTION_DNS_REVERSE_LOOKUP,
- SSL_TUNNEL,
- EXTENSION_METHOD_TUNNEL,
+ SM_ACTION_CACHE_LOOKUP,
+ SM_ACTION_CACHE_ISSUE_WRITE,
+ SM_ACTION_CACHE_ISSUE_WRITE_TRANSFORM,
+ SM_ACTION_CACHE_PREPARE_UPDATE,
+ SM_ACTION_CACHE_ISSUE_UPDATE,
- CONTINUE,
+ SM_ACTION_ICP_QUERY,
- HTTP_API_SM_START,
-
- HTTP_API_READ_REQUEST_HDR,
- HTTP_API_PRE_REMAP,
- HTTP_REMAP_REQUEST,
- HTTP_API_POST_REMAP,
- HTTP_POST_REMAP_SKIP,
- HTTP_POST_REMAP_UPGRADE,
-
- HTTP_API_OS_DNS,
- HTTP_API_SEND_REQUEST_HDR,
- HTTP_API_READ_CACHE_HDR,
- HTTP_API_CACHE_LOOKUP_COMPLETE,
- HTTP_API_READ_RESPONSE_HDR,
- HTTP_API_SEND_RESPONSE_HDR,
- REDIRECT_READ,
- HTTP_API_SM_SHUTDOWN
+ SM_ACTION_ORIGIN_SERVER_OPEN,
+ SM_ACTION_ORIGIN_SERVER_RAW_OPEN,
+ SM_ACTION_ORIGIN_SERVER_RR_MARK_DOWN,
+
+ SM_ACTION_READ_PUSH_HDR,
+ SM_ACTION_STORE_PUSH_BODY,
+
+ SM_ACTION_INTERNAL_CACHE_DELETE,
+ SM_ACTION_INTERNAL_CACHE_NOOP,
+ SM_ACTION_INTERNAL_CACHE_UPDATE_HEADERS,
+ SM_ACTION_INTERNAL_CACHE_WRITE,
+ SM_ACTION_INTERNAL_100_RESPONSE,
+ SM_ACTION_INTERNAL_REQUEST,
+ SM_ACTION_SEND_ERROR_CACHE_NOOP,
+
+#ifdef PROXY_DRAIN
+ SM_ACTION_DRAIN_REQUEST_BODY,
+#endif /* PROXY_DRAIN */
+
+ SM_ACTION_SERVE_FROM_CACHE,
+ SM_ACTION_SERVER_READ,
+ SM_ACTION_SERVER_PARSE_NEXT_HDR,
+ SM_ACTION_TRANSFORM_READ,
+ SM_ACTION_SSL_TUNNEL,
+ SM_ACTION_CONTINUE,
+
+ SM_ACTION_API_SM_START,
+ SM_ACTION_API_READ_REQUEST_HDR,
+ SM_ACTION_API_PRE_REMAP,
+ SM_ACTION_API_POST_REMAP,
+ SM_ACTION_API_OS_DNS,
+ SM_ACTION_API_SEND_REQUEST_HDR,
+ SM_ACTION_API_READ_CACHE_HDR,
+ SM_ACTION_API_CACHE_LOOKUP_COMPLETE,
+ SM_ACTION_API_READ_RESPONSE_HDR,
+ SM_ACTION_API_SEND_RESPONSE_HDR,
+ SM_ACTION_API_SM_SHUTDOWN,
+
+ SM_ACTION_REMAP_REQUEST,
+ SM_ACTION_POST_REMAP_SKIP,
+ SM_ACTION_REDIRECT_READ
};
enum TransferEncoding_t
@@ -1040,7 +1034,7 @@ public:
pre_transform_source(SOURCE_NONE),
req_flavor(REQ_FLAVOR_FWDPROXY),
pending_work(NULL),
- cdn_saved_next_action(STATE_MACHINE_ACTION_UNDEFINED),
+ cdn_saved_next_action(SM_ACTION_UNDEFINED),
cdn_saved_transact_return_point(NULL),
cdn_remap_complete(false),
first_dns_lookup(true),
@@ -1048,8 +1042,8 @@ public:
cache_lookup_result(CACHE_LOOKUP_NONE),
backdoor_request(false),
cop_test_page(false),
- next_action(STATE_MACHINE_ACTION_UNDEFINED),
- api_next_action(STATE_MACHINE_ACTION_UNDEFINED),
+ next_action(SM_ACTION_UNDEFINED),
+ api_next_action(SM_ACTION_UNDEFINED),
transact_return_point(NULL),
is_upgrade_request(false),
post_remap_upgrade_return_point(NULL),
@@ -1102,12 +1096,12 @@ public:
api_server_addr_set(false),
api_update_cached_object(UPDATE_CACHED_OBJECT_NONE),
api_lock_url(LOCK_URL_FIRST),
- saved_update_next_action(STATE_MACHINE_ACTION_UNDEFINED),
+ saved_update_next_action(SM_ACTION_UNDEFINED),
saved_update_cache_action(CACHE_DO_UNDEFINED),
stale_icp_lookup(false),
url_map(),
pCongestionEntry(NULL),
- congest_saved_next_action(STATE_MACHINE_ACTION_UNDEFINED),
+ congest_saved_next_action(SM_ACTION_UNDEFINED),
congestion_control_crat(0),
congestion_congested_or_failed(0),
congestion_connection_opened(0),
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/70599abf/proxy/http/HttpUpdateSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpUpdateSM.cc b/proxy/http/HttpUpdateSM.cc
index 8ff409b..a5b604e 100644
--- a/proxy/http/HttpUpdateSM.cc
+++ b/proxy/http/HttpUpdateSM.cc
@@ -103,10 +103,10 @@ HttpUpdateSM::handle_api_return()
{
switch (t_state.api_next_action) {
- case HttpTransact::HTTP_API_SM_START:
+ case HttpTransact::SM_ACTION_API_SM_START:
call_transact_and_set_next_state(&HttpTransact::ModifyRequest);
return;
- case HttpTransact::HTTP_API_SEND_RESPONSE_HDR:
+ case HttpTransact::SM_ACTION_API_SEND_RESPONSE_HDR:
// we have further processing to do
// based on what t_state.next_action is
break;
@@ -116,7 +116,7 @@ HttpUpdateSM::handle_api_return()
}
switch (t_state.next_action) {
- case HttpTransact::TRANSFORM_READ:
+ case HttpTransact::SM_ACTION_TRANSFORM_READ:
{
if (t_state.cache_info.transform_action == HttpTransact::CACHE_DO_WRITE) {
// Transform output cachable so initiate the transfer
@@ -153,11 +153,11 @@ HttpUpdateSM::handle_api_return()
}
break;
}
- case HttpTransact::PROXY_INTERNAL_CACHE_WRITE:
- case HttpTransact::SERVER_READ:
- case HttpTransact::PROXY_INTERNAL_CACHE_NOOP:
- case HttpTransact::PROXY_SEND_ERROR_CACHE_NOOP:
- case HttpTransact::SERVE_FROM_CACHE:
+ case HttpTransact::SM_ACTION_INTERNAL_CACHE_WRITE:
+ case HttpTransact::SM_ACTION_SERVER_READ:
+ case HttpTransact::SM_ACTION_INTERNAL_CACHE_NOOP:
+ case HttpTransact::SM_ACTION_SEND_ERROR_CACHE_NOOP:
+ case HttpTransact::SM_ACTION_SERVE_FROM_CACHE:
{
cb_event = HTTP_SCH_UPDATE_EVENT_NOT_CACHED;
t_state.squid_codes.log_code = SQUID_LOG_TCP_MISS;
@@ -165,10 +165,10 @@ HttpUpdateSM::handle_api_return()
return;
}
- case HttpTransact::PROXY_INTERNAL_CACHE_DELETE:
- case HttpTransact::PROXY_INTERNAL_CACHE_UPDATE_HEADERS:
+ case HttpTransact::SM_ACTION_INTERNAL_CACHE_DELETE:
+ case HttpTransact::SM_ACTION_INTERNAL_CACHE_UPDATE_HEADERS:
{
- if (t_state.next_action == HttpTransact::PROXY_INTERNAL_CACHE_DELETE) {
+ if (t_state.next_action == HttpTransact::SM_ACTION_INTERNAL_CACHE_DELETE) {
cb_event = HTTP_SCH_UPDATE_EVENT_DELETED;
} else {
cb_event = HTTP_SCH_UPDATE_EVENT_UPDATED;
@@ -192,7 +192,7 @@ HttpUpdateSM::set_next_state()
if (t_state.cache_info.action == HttpTransact::CACHE_DO_NO_ACTION ||
t_state.cache_info.action == HttpTransact::CACHE_DO_SERVE) {
- if (t_state.next_action == HttpTransact::SERVE_FROM_CACHE) {
+ if (t_state.next_action == HttpTransact::SM_ACTION_SERVE_FROM_CACHE) {
cb_event = HTTP_SCH_UPDATE_EVENT_NO_ACTION;
t_state.squid_codes.log_code = SQUID_LOG_TCP_HIT;
} else {