You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2021/03/16 19:31:01 UTC
[trafficserver] branch 9.1.x updated (e8db7c4 -> eb8cd97)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a change to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from e8db7c4 Fix the connection limit crash while using parents (#7602)
new 181ecaf Remove inline for detail::cache::CacheData::idAddr (#7592)
new eb8cd97 Remove UnixNetVConnection::startEvent - not actually called. (#7596)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 +---------------------
src/wccp/WccpEndPoint.cc | 2 +-
7 files changed, 2 insertions(+), 46 deletions(-)
[trafficserver] 02/02: Remove UnixNetVConnection::startEvent - not
actually called. (#7596)
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit eb8cd976267302ae21a61f7f822baa0ac7f08c16
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Mon Mar 15 19:31:46 2021 -0500
Remove UnixNetVConnection::startEvent - not actually called. (#7596)
(cherry picked from commit a56638f8ba92c48e2cc8b677438c36e13f393e2b)
---
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 f04f32d..a9cde60 100644
--- a/iocore/net/P_QUICNetVConnection.h
+++ b/iocore/net/P_QUICNetVConnection.h
@@ -166,7 +166,6 @@ public:
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 29b3366..8d34bf8 100644
--- a/iocore/net/P_UnixNetVConnection.h
+++ b/iocore/net/P_UnixNetVConnection.h
@@ -268,7 +268,6 @@ public:
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 5bdaa2b..edb5110 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 fbba684..dc9d1b6 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 fda1df6..99688bb 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -980,7 +980,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 d678c65..00ca4cf 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
@@ -1050,22 +1047,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;
@@ -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());
[trafficserver] 01/02: Remove inline for
detail::cache::CacheData::idAddr (#7592)
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 181ecaf6517b62474be9d8b2bdff9482893f8cf7
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Mon Mar 15 19:32:31 2021 -0500
Remove inline for detail::cache::CacheData::idAddr (#7592)
This avoids a warning in FreeBSD clang-10 builds.
(cherry picked from commit 7af385faf5bfb644ae200682fb156d1433437683)
---
src/wccp/WccpEndPoint.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/wccp/WccpEndPoint.cc b/src/wccp/WccpEndPoint.cc
index 50b7da2..2298a84 100644
--- a/src/wccp/WccpEndPoint.cc
+++ b/src/wccp/WccpEndPoint.cc
@@ -357,7 +357,7 @@ CacheImpl::RouterData::waitTime(time_t now) const
return m_assign ? 0 : this->pingTime(now);
}
-inline uint32_t
+uint32_t
detail::cache::CacheData::idAddr() const
{
return m_id.getAddr();