This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 1b1212532956bff0baa2577481b2af7db3261e7a Author: Masaori Koshiba <[email protected]> AuthorDate: Thu Apr 11 07:39:48 2024 +0900 Cleanup: rename client_vc to txn (#11234) (cherry picked from commit ceb60aeaf77e3cf83ca6fa1109a7b90d7d88b154) --- include/proxy/http/HttpSM.h | 2 +- src/proxy/http/HttpSM.cc | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/proxy/http/HttpSM.h b/include/proxy/http/HttpSM.h index 6f28523d0b..3b2dacb256 100644 --- a/include/proxy/http/HttpSM.h +++ b/include/proxy/http/HttpSM.h @@ -186,7 +186,7 @@ public: void init(bool from_early_data = false); - void attach_client_session(ProxyTransaction *client_vc_arg); + void attach_client_session(ProxyTransaction *txn); // Called after the network connection has been completed // to set the session timeouts and initiate a read while diff --git a/src/proxy/http/HttpSM.cc b/src/proxy/http/HttpSM.cc index 9ef713dbdd..d268d74db9 100644 --- a/src/proxy/http/HttpSM.cc +++ b/src/proxy/http/HttpSM.cc @@ -371,16 +371,16 @@ HttpSM::start_sub_sm() } void -HttpSM::attach_client_session(ProxyTransaction *client_vc) +HttpSM::attach_client_session(ProxyTransaction *txn) { milestones[TS_MILESTONE_UA_BEGIN] = ink_get_hrtime(); - ink_assert(client_vc != nullptr); + ink_assert(txn != nullptr); - NetVConnection *netvc = client_vc->get_netvc(); + NetVConnection *netvc = txn->get_netvc(); if (!netvc) { return; } - _ua.set_txn(client_vc, milestones); + _ua.set_txn(txn, milestones); // Collect log & stats information. We've already verified that the netvc is !nullptr above, // and netvc == _ua.get_txn()->get_netvc(). @@ -389,7 +389,7 @@ HttpSM::attach_client_session(ProxyTransaction *client_vc) mptcp_state = netvc->get_mptcp_state(); ink_release_assert(_ua.get_txn()->get_half_close_flag() == false); - mutex = client_vc->mutex; + mutex = txn->mutex; if (_ua.get_txn()->debug()) { debug_on = true; } @@ -408,7 +408,7 @@ HttpSM::attach_client_session(ProxyTransaction *client_vc) // Allocate a user agent entry in the state machine's // vc table _ua.set_entry(vc_table.new_entry()); - _ua.get_entry()->vc = client_vc; + _ua.get_entry()->vc = txn; _ua.get_entry()->vc_type = HTTP_UA_VC; ats_ip_copy(&t_state.client_info.src_addr, netvc->get_remote_addr()); @@ -417,7 +417,7 @@ HttpSM::attach_client_session(ProxyTransaction *client_vc) t_state.client_info.port_attribute = static_cast<HttpProxyPort::TransportType>(netvc->attributes); // Record api hook set state - hooks_set = client_vc->has_hooks(); + hooks_set = txn->has_hooks(); // Setup for parsing the header _ua.get_entry()->vc_read_handler = &HttpSM::state_read_client_request_header; @@ -434,14 +434,14 @@ HttpSM::attach_client_session(ProxyTransaction *client_vc) // this hook maybe asynchronous, we need to disable IO on // client but set the continuation to be the state machine // so if we get an timeout events the sm handles them - _ua.get_entry()->read_vio = client_vc->do_io_read(this, 0, _ua.get_txn()->get_remote_reader()->mbuf); - _ua.get_entry()->write_vio = client_vc->do_io_write(this, 0, nullptr); + _ua.get_entry()->read_vio = txn->do_io_read(this, 0, _ua.get_txn()->get_remote_reader()->mbuf); + _ua.get_entry()->write_vio = txn->do_io_write(this, 0, nullptr); ///////////////////////// // set up timeouts // ///////////////////////// - client_vc->set_inactivity_timeout(HRTIME_SECONDS(t_state.txn_conf->transaction_no_activity_timeout_in)); - client_vc->set_active_timeout(HRTIME_SECONDS(t_state.txn_conf->transaction_active_timeout_in)); + txn->set_inactivity_timeout(HRTIME_SECONDS(t_state.txn_conf->transaction_no_activity_timeout_in)); + txn->set_active_timeout(HRTIME_SECONDS(t_state.txn_conf->transaction_active_timeout_in)); ++reentrancy_count; // Add our state sm to the sm list
