From 6fc37c35580b405c11f17c2847ee33398231560f Mon Sep 17 00:00:00 2001 From: "Alan M. Carroll" Date: Fri, 12 Mar 2021 12:16:01 -0600 Subject: [PATCH] Remove UnixNetVConnection::startEvent - not actually called. --- iocore/net/P_QUICNetVConnection.h | 1 - iocore/net/P_UnixNetVConnection.h | 1 - iocore/net/QUICNetProcessor.cc | 1 - iocore/net/QUICNetVConnection.cc | 20 -------------------- iocore/net/SSLNetVConnection.cc | 1 - iocore/net/UnixNetVConnection.cc | 22 +--------------------- 6 files changed, 1 insertion(+), 45 deletions(-) diff --git a/iocore/net/P_QUICNetVConnection.h b/iocore/net/P_QUICNetVConnection.h index bcc23b15305..eb9f4f59e8d 100644 --- a/iocore/net/P_QUICNetVConnection.h +++ b/iocore/net/P_QUICNetVConnection.h @@ -166,7 +166,6 @@ class QUICNetVConnection : public UnixNetVConnection, int connectUp(EThread *t, int fd) override; // QUICNetVConnection - int startEvent(int event, Event *e); int state_pre_handshake(int event, Event *data); int state_handshake(int event, Event *data); int state_connection_established(int event, Event *data); diff --git a/iocore/net/P_UnixNetVConnection.h b/iocore/net/P_UnixNetVConnection.h index 29b33668b88..8d34bf8a6e6 100644 --- a/iocore/net/P_UnixNetVConnection.h +++ b/iocore/net/P_UnixNetVConnection.h @@ -268,7 +268,6 @@ class UnixNetVConnection : public NetVConnection, public NetEvent bool from_accept_thread = false; NetAccept *accept_object = nullptr; - int startEvent(int event, Event *e); int acceptEvent(int event, Event *e); int mainEvent(int event, Event *e); virtual int connectUp(EThread *t, int fd); diff --git a/iocore/net/QUICNetProcessor.cc b/iocore/net/QUICNetProcessor.cc index 5bdaa2b8dc7..edb51103c80 100644 --- a/iocore/net/QUICNetProcessor.cc +++ b/iocore/net/QUICNetProcessor.cc @@ -149,7 +149,6 @@ QUICNetProcessor::connect_re(Continuation *cont, sockaddr const *remote_addr, Ne // Setup QUICNetVConnection QUICConnectionId client_dst_cid; client_dst_cid.randomize(); - // vc->init set handler of vc `QUICNetVConnection::startEvent` vc->init(QUIC_SUPPORTED_VERSIONS[0], client_dst_cid, client_dst_cid, con, packet_handler, this->_rtable); packet_handler->init(vc); diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc index 140bfb7b4e9..51cf89fa516 100644 --- a/iocore/net/QUICNetVConnection.cc +++ b/iocore/net/QUICNetVConnection.cc @@ -242,7 +242,6 @@ void QUICNetVConnection::init(QUICVersion version, QUICConnectionId peer_cid, QUICConnectionId original_cid, UDPConnection *udp_con, QUICPacketHandler *packet_handler, QUICResetTokenTable *rtable) { - SET_HANDLER((NetVConnHandler)&QUICNetVConnection::startEvent); this->_initial_version = version; this->_udp_con = udp_con; this->_packet_handler = packet_handler; @@ -389,25 +388,6 @@ QUICNetVConnection::acceptEvent(int event, Event *e) return EVENT_DONE; } -int -QUICNetVConnection::startEvent(int event, Event *e) -{ - ink_assert(event == EVENT_IMMEDIATE); - MUTEX_TRY_LOCK(lock, get_NetHandler(e->ethread)->mutex, e->ethread); - if (!lock.is_locked()) { - e->schedule_in(HRTIME_MSECONDS(net_retry_delay)); - return EVENT_CONT; - } - - if (!action_.cancelled) { - this->connectUp(e->ethread, NO_FD); - } else { - this->free(e->ethread); - } - - return EVENT_DONE; -} - // XXX This might be called on ET_UDP thread void QUICNetVConnection::start() diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc index 4de9cc1efa1..425ee3d09e2 100644 --- a/iocore/net/SSLNetVConnection.cc +++ b/iocore/net/SSLNetVConnection.cc @@ -984,7 +984,6 @@ SSLNetVConnection::free(EThread *t) early_data_buf = nullptr; clear(); - SET_CONTINUATION_HANDLER(this, (SSLNetVConnHandler)&SSLNetVConnection::startEvent); ink_assert(con.fd == NO_FD); ink_assert(t == this_ethread()); diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc index d678c657a39..00ca4cfeb90 100644 --- a/iocore/net/UnixNetVConnection.cc +++ b/iocore/net/UnixNetVConnection.cc @@ -883,10 +883,7 @@ UnixNetVConnection::reenable_re(VIO *vio) } } -UnixNetVConnection::UnixNetVConnection() -{ - SET_HANDLER((NetVConnHandler)&UnixNetVConnection::startEvent); -} +UnixNetVConnection::UnixNetVConnection() {} // Private methods @@ -1049,22 +1046,6 @@ UnixNetVConnection::netActivity(EThread *lthread) net_activity(this, lthread); } -int -UnixNetVConnection::startEvent(int /* event ATS_UNUSED */, Event *e) -{ - MUTEX_TRY_LOCK(lock, get_NetHandler(e->ethread)->mutex, e->ethread); - if (!lock.is_locked()) { - e->schedule_in(HRTIME_MSECONDS(net_retry_delay)); - return EVENT_CONT; - } - if (!action_.cancelled) { - connectUp(e->ethread, NO_FD); - } else { - free(e->ethread); - } - return EVENT_DONE; -} - int UnixNetVConnection::acceptEvent(int event, Event *e) { @@ -1354,7 +1335,6 @@ UnixNetVConnection::free(EThread *t) con.close(); clear(); - SET_CONTINUATION_HANDLER(this, (NetVConnHandler)&UnixNetVConnection::startEvent); ink_assert(con.fd == NO_FD); ink_assert(t == this_ethread());