Skip to content

Revert "Remove UnixNetVConnection::startEvent - not actually called." #8180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tomoatan wants to merge 1 commit into from
Closed

Revert "Remove UnixNetVConnection::startEvent - not actually called." #8180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions iocore/net/P_UnixNetVConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ class UnixNetVConnection : public NetVConnection
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);
Expand Down
1 change: 1 addition & 0 deletions iocore/net/SSLNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,7 @@ 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());

Expand Down
18 changes: 18 additions & 0 deletions iocore/net/UnixNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,7 @@ UnixNetVConnection::UnixNetVConnection()
origin_trace_addr(nullptr),
origin_trace_port(0)
{
SET_HANDLER((NetVConnHandler)&UnixNetVConnection::startEvent);
}

// Private methods
Expand Down Expand Up @@ -1067,6 +1068,22 @@ 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)
{
Expand Down Expand Up @@ -1356,6 +1373,7 @@ 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());

Expand Down