Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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_QUICNetVConnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ 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);
Expand Down
1 change: 1 addition & 0 deletions iocore/net/P_UnixNetVConnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ 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);
Expand Down
1 change: 1 addition & 0 deletions iocore/net/QUICNetProcessor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ 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);

Expand Down
20 changes: 20 additions & 0 deletions iocore/net/QUICNetVConnection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ 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;
Expand Down Expand Up @@ -388,6 +389,25 @@ 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()
Expand Down
1 change: 1 addition & 0 deletions iocore/net/SSLNetVConnection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,7 @@ 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());

Expand Down
22 changes: 21 additions & 1 deletion iocore/net/UnixNetVConnection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,10 @@ UnixNetVConnection::reenable_re(VIO *vio)
}
}

UnixNetVConnection::UnixNetVConnection() {}
UnixNetVConnection::UnixNetVConnection()
{
SET_HANDLER((NetVConnHandler)&UnixNetVConnection::startEvent);
}

// Private methods

Expand Down Expand Up @@ -990,6 +993,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 @@ -1277,6 +1296,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