This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/8.1.x by this push:
new 9fcc315 Remove UnixNetVConnection::startEvent - not actually called.
(#7609)
9fcc315 is described below
commit 9fcc315558102d24973ee6342082544339217692
Author: Brian Neradt <[email protected]>
AuthorDate: Wed Mar 17 12:42:11 2021 -0500
Remove UnixNetVConnection::startEvent - not actually called. (#7609)
(cherry picked from commit a56638f8ba92c48e2cc8b677438c36e13f393e2b)
---
iocore/net/P_UnixNetVConnection.h | 1 -
iocore/net/SSLNetVConnection.cc | 1 -
iocore/net/UnixNetVConnection.cc | 18 ------------------
3 files changed, 20 deletions(-)
diff --git a/iocore/net/P_UnixNetVConnection.h
b/iocore/net/P_UnixNetVConnection.h
index 1fef6b9..37b4278 100644
--- a/iocore/net/P_UnixNetVConnection.h
+++ b/iocore/net/P_UnixNetVConnection.h
@@ -266,7 +266,6 @@ public:
const sockaddr *origin_trace_addr;
int origin_trace_port;
- 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/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 72b6913..881b71a 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -957,7 +957,6 @@ SSLNetVConnection::free(EThread *t)
con.close();
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 f25f9bb..6fb6fa8 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -894,7 +894,6 @@ UnixNetVConnection::UnixNetVConnection()
origin_trace_addr(nullptr),
origin_trace_port(0)
{
- SET_HANDLER((NetVConnHandler)&UnixNetVConnection::startEvent);
}
// Private methods
@@ -1069,22 +1068,6 @@ UnixNetVConnection::netActivity(EThread *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)
{
EThread *t = (e == nullptr) ? this_ethread() : e->ethread;
@@ -1373,7 +1356,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());