Skip to content

Commit 692bc00

Browse files
authored
clean-up: use Mutex reference p1 (#42670)
Replace absl::MutexLock::MutexLock(Mutex*) constructor with absl::MutexLock::MutexLock(Mutex&) Similar to #41948 Commit Message: Additional Description: Risk Level: Testing: Docs Changes: Release Notes: Platform Specific Features: --------- Signed-off-by: Boteng Yao <boteng@google.com>
1 parent a0a71c5 commit 692bc00

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

source/common/quic/quic_server_transport_socket_factory.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ QuicServerTransportSocketFactory::getTlsCertificateAndKey(absl::string_view sni,
154154
// ssl_ctx. Capture ssl_ctx_ into a local variable so that we check and use the same ssl_ctx.
155155
Envoy::Ssl::ServerContextSharedPtr ssl_ctx;
156156
{
157-
absl::ReaderMutexLock l(&ssl_ctx_mu_);
157+
absl::ReaderMutexLock l(ssl_ctx_mu_);
158158
ssl_ctx = ssl_ctx_;
159159
}
160160
if (!ssl_ctx) {
@@ -181,7 +181,7 @@ absl::Status QuicServerTransportSocketFactory::onSecretUpdated() {
181181
auto ctx_or_error = createSslServerContext();
182182
RETURN_IF_NOT_OK(ctx_or_error.status());
183183
{
184-
absl::WriterMutexLock l(&ssl_ctx_mu_);
184+
absl::WriterMutexLock l(ssl_ctx_mu_);
185185
std::swap(*ctx_or_error, ssl_ctx_);
186186
}
187187
manager_.removeContext(*ctx_or_error);

source/common/tls/client_context_impl.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ ClientContextImpl::newSsl(const Network::TransportSocketOptionsConstSharedPtr& o
162162
if (max_session_keys_ > 0) {
163163
if (session_keys_single_use_) {
164164
// Stored single-use session keys, use write/write locks.
165-
absl::WriterMutexLock l(&session_keys_mu_);
165+
absl::WriterMutexLock l(session_keys_mu_);
166166
if (!session_keys_.empty()) {
167167
// Use the most recently stored session key, since it has the highest
168168
// probability of still being recognized/accepted by the server.
@@ -175,7 +175,7 @@ ClientContextImpl::newSsl(const Network::TransportSocketOptionsConstSharedPtr& o
175175
}
176176
} else {
177177
// Never stored single-use session keys, use read/write locks.
178-
absl::ReaderMutexLock l(&session_keys_mu_);
178+
absl::ReaderMutexLock l(session_keys_mu_);
179179
if (!session_keys_.empty()) {
180180
// Use the most recently stored session key, since it has the highest
181181
// probability of still being recognized/accepted by the server.
@@ -194,7 +194,7 @@ int ClientContextImpl::newSessionKey(SSL_SESSION* session) {
194194
if (SSL_SESSION_should_be_single_use(session)) {
195195
session_keys_single_use_ = true;
196196
}
197-
absl::WriterMutexLock l(&session_keys_mu_);
197+
absl::WriterMutexLock l(session_keys_mu_);
198198
// Evict oldest entries.
199199
while (session_keys_.size() >= max_session_keys_) {
200200
session_keys_.pop_back();

source/common/tls/client_ssl_socket.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ ClientSslSocketFactory::ClientSslSocketFactory(Envoy::Ssl::ClientContextConfigPt
4343
: manager_(manager), stats_scope_(stats_scope), stats_(generateStats(stats_scope)),
4444
config_(std::move(config)) {
4545
{
46-
absl::WriterMutexLock l(&ssl_ctx_mu_);
46+
absl::WriterMutexLock l(ssl_ctx_mu_);
4747
auto ctx_or_error = manager_.createSslClientContext(stats_scope_, *config_);
4848
SET_AND_RETURN_IF_NOT_OK(ctx_or_error.status(), creation_status);
4949
ssl_ctx_ = *ctx_or_error;
@@ -61,7 +61,7 @@ Network::TransportSocketPtr ClientSslSocketFactory::createTransportSocket(
6161
// use the same ssl_ctx to create SslSocket.
6262
Envoy::Ssl::ClientContextSharedPtr ssl_ctx;
6363
{
64-
absl::ReaderMutexLock l(&ssl_ctx_mu_);
64+
absl::ReaderMutexLock l(ssl_ctx_mu_);
6565
ssl_ctx = ssl_ctx_;
6666
}
6767
if (ssl_ctx) {
@@ -86,7 +86,7 @@ absl::Status ClientSslSocketFactory::onAddOrUpdateSecret() {
8686
auto ctx_or_error = manager_.createSslClientContext(stats_scope_, *config_);
8787
RETURN_IF_NOT_OK(ctx_or_error.status());
8888
{
89-
absl::WriterMutexLock l(&ssl_ctx_mu_);
89+
absl::WriterMutexLock l(ssl_ctx_mu_);
9090
std::swap(*ctx_or_error, ssl_ctx_);
9191
}
9292
manager_.removeContext(*ctx_or_error);
@@ -95,7 +95,7 @@ absl::Status ClientSslSocketFactory::onAddOrUpdateSecret() {
9595
}
9696

9797
Envoy::Ssl::ClientContextSharedPtr ClientSslSocketFactory::sslCtx() {
98-
absl::ReaderMutexLock l(&ssl_ctx_mu_);
98+
absl::ReaderMutexLock l(ssl_ctx_mu_);
9999
return ssl_ctx_;
100100
}
101101

source/common/tls/server_ssl_socket.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Network::TransportSocketPtr ServerSslSocketFactory::createDownstreamTransportSoc
5757
// use the same ssl_ctx to create SslSocket.
5858
Envoy::Ssl::ServerContextSharedPtr ssl_ctx;
5959
{
60-
absl::ReaderMutexLock l(&ssl_ctx_mu_);
60+
absl::ReaderMutexLock l(ssl_ctx_mu_);
6161
ssl_ctx = ssl_ctx_;
6262
}
6363
if (ssl_ctx) {
@@ -81,7 +81,7 @@ absl::Status ServerSslSocketFactory::onAddOrUpdateSecret() {
8181
auto ctx_or_error = manager_.createSslServerContext(stats_scope_, *config_, nullptr);
8282
RETURN_IF_NOT_OK(ctx_or_error.status());
8383
{
84-
absl::WriterMutexLock l(&ssl_ctx_mu_);
84+
absl::WriterMutexLock l(ssl_ctx_mu_);
8585
std::swap(*ctx_or_error, ssl_ctx_);
8686
}
8787
manager_.removeContext(*ctx_or_error);

0 commit comments

Comments
 (0)