From 0020e47091250a7b0140ed0eb0a9b7c974971e5c Mon Sep 17 00:00:00 2001
From: Matt Millett <mmillett@mailbox.org>
Date: Fri, 21 Jun 2024 14:55:36 -0400
Subject: [PATCH] Use lock guards suitable for configurable mutex
 implementations

---
 groups/ntc/ntcp/ntcp_interface.cpp | 26 ++++++++++----------
 groups/ntc/ntcp/ntcp_interface.h   | 38 +++++++++++++++---------------
 groups/ntc/ntcr/ntcr_interface.cpp | 26 ++++++++++----------
 groups/ntc/ntcr/ntcr_interface.h   | 38 +++++++++++++++---------------
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/groups/ntc/ntcp/ntcp_interface.cpp b/groups/ntc/ntcp/ntcp_interface.cpp
index 38472688..b1229802 100644
--- a/groups/ntc/ntcp/ntcp_interface.cpp
+++ b/groups/ntc/ntcp/ntcp_interface.cpp
@@ -335,7 +335,7 @@ ntsa::Error Interface::addThread()
 bsl::shared_ptr<ntci::Proactor> Interface::acquireProactorUsedByThreadHandle(
     const ntca::LoadBalancingOptions& options)
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
 
     bsl::shared_ptr<ntci::Proactor> result;
 
@@ -366,7 +366,7 @@ bsl::shared_ptr<ntci::Proactor> Interface::acquireProactorUsedByThreadHandle(
 bsl::shared_ptr<ntci::Proactor> Interface::acquireProactorUsedByThreadIndex(
     const ntca::LoadBalancingOptions& options)
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
 
     bsl::shared_ptr<ntci::Proactor> result;
 
@@ -401,7 +401,7 @@ bsl::shared_ptr<ntci::Proactor> Interface::acquireProactorUsedByThreadIndex(
 bsl::shared_ptr<ntci::Proactor> Interface::acquireProactorWithLeastLoad(
     const ntca::LoadBalancingOptions& options)
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
 
     NTCI_LOG_CONTEXT();
 
@@ -563,7 +563,7 @@ ntsa::Error Interface::start()
     bsl::shared_ptr<ntci::Resolver> resolver;
 
     {
-        bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+        LockGuard lock(&d_mutex);
 
         if (!d_resolver_sp) {
             BSLS_ASSERT_OPT(!d_config.resolverEnabled().isNull());
@@ -618,7 +618,7 @@ void Interface::shutdown()
     bsl::shared_ptr<ntci::Resolver> resolver;
     ProactorVector                  proactorVector(d_allocator_p);
     {
-        bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+        LockGuard lock(&d_mutex);
 
         resolver       = d_resolver_sp;
         proactorVector = d_proactorVector;
@@ -645,7 +645,7 @@ void Interface::linger()
     ThreadVector   threadVector(d_allocator_p);
     ProactorVector proactorVector(d_allocator_p);
     {
-        bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+        LockGuard lock(&d_mutex);
 
         resolver       = d_resolver_sp;
         threadVector   = d_threadVector;
@@ -681,7 +681,7 @@ void Interface::linger()
     proactorVector.clear();
 
     {
-        bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+        LockGuard lock(&d_mutex);
 
         d_threadVector.clear();
         d_threadMap.clear();
@@ -698,7 +698,7 @@ ntsa::Error Interface::closeAll()
 
     ProactorVector proactorVector(d_allocator_p);
     {
-        bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+        LockGuard lock(&d_mutex);
         proactorVector = d_proactorVector;
     }
 
@@ -1489,7 +1489,7 @@ void Interface::releaseHandleReservation()
 
 bool Interface::expand()
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
 
     NTCI_LOG_CONTEXT();
 
@@ -1510,13 +1510,13 @@ bool Interface::expand()
 
 bsl::size_t Interface::numProactors() const
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
     return d_proactorVector.size();
 }
 
 bsl::size_t Interface::numThreads() const
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
     return d_threadVector.size();
 }
 
@@ -1544,7 +1544,7 @@ bool Interface::lookupByThreadHandle(
     bsl::shared_ptr<ntci::Executor>* result,
     bslmt::ThreadUtil::Handle        threadHandle) const
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
 
     result->reset();
 
@@ -1575,7 +1575,7 @@ bool Interface::lookupByThreadHandle(
 bool Interface::lookupByThreadIndex(bsl::shared_ptr<ntci::Executor>* result,
                                     bsl::size_t threadIndex) const
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
 
     result->reset();
 
diff --git a/groups/ntc/ntcp/ntcp_interface.h b/groups/ntc/ntcp/ntcp_interface.h
index d2537c7e..be3889f1 100644
--- a/groups/ntc/ntcp/ntcp_interface.h
+++ b/groups/ntc/ntcp/ntcp_interface.h
@@ -76,28 +76,28 @@ class Interface : public ntci::Interface,
     /// Define a type alias for a vector of proactors.
     typedef bsl::vector<bsl::shared_ptr<ntci::Proactor> > ProactorVector;
 
-    ntccfg::Object d_object;
-
-    mutable ntccfg::Mutex d_mutex;
-
-    bsl::shared_ptr<ntcs::User>     d_user_sp;
-    bsl::shared_ptr<ntci::DataPool> d_dataPool_sp;
-    bsl::shared_ptr<ntci::Resolver> d_resolver_sp;
-
-    bsl::shared_ptr<ntci::Reservation> d_connectionLimiter_sp;
-    bsl::shared_ptr<ntcs::Metrics>     d_socketMetrics_sp;
-
+    // Define a type alias for a mutex.
+    typedef ntccfg::Mutex Mutex;
+
+    /// Define a type alias for a mutex lock guard.
+    typedef ntccfg::LockGuard LockGuard;
+
+    ntccfg::Object                         d_object;
+    mutable Mutex                          d_mutex;
+    bsl::shared_ptr<ntcs::User>            d_user_sp;
+    bsl::shared_ptr<ntci::DataPool>        d_dataPool_sp;
+    bsl::shared_ptr<ntci::Resolver>        d_resolver_sp;
+    bsl::shared_ptr<ntci::Reservation>     d_connectionLimiter_sp;
+    bsl::shared_ptr<ntcs::Metrics>         d_socketMetrics_sp;
     bsl::shared_ptr<ntci::ProactorFactory> d_proactorFactory_sp;
     bsl::shared_ptr<ntci::ProactorMetrics> d_proactorMetrics_sp;
     ProactorVector                         d_proactorVector;
-
-    ThreadVector     d_threadVector;
-    ThreadMap        d_threadMap;
-    bslmt::Semaphore d_threadSemaphore;
-    bsl::size_t      d_threadWatermark;
-
-    ntca::InterfaceConfig d_config;
-    bslma::Allocator*     d_allocator_p;
+    ThreadVector                           d_threadVector;
+    ThreadMap                              d_threadMap;
+    bslmt::Semaphore                       d_threadSemaphore;
+    bsl::size_t                            d_threadWatermark;
+    ntca::InterfaceConfig                  d_config;
+    bslma::Allocator*                      d_allocator_p;
 
   private:
     Interface(const Interface&) BSLS_KEYWORD_DELETED;
diff --git a/groups/ntc/ntcr/ntcr_interface.cpp b/groups/ntc/ntcr/ntcr_interface.cpp
index 01b9ff10..4e3700df 100644
--- a/groups/ntc/ntcr/ntcr_interface.cpp
+++ b/groups/ntc/ntcr/ntcr_interface.cpp
@@ -344,7 +344,7 @@ ntsa::Error Interface::addThread()
 bsl::shared_ptr<ntci::Reactor> Interface::acquireReactorUsedByThreadHandle(
     const ntca::LoadBalancingOptions& options)
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
 
     bsl::shared_ptr<ntci::Reactor> result;
 
@@ -375,7 +375,7 @@ bsl::shared_ptr<ntci::Reactor> Interface::acquireReactorUsedByThreadHandle(
 bsl::shared_ptr<ntci::Reactor> Interface::acquireReactorUsedByThreadIndex(
     const ntca::LoadBalancingOptions& options)
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
 
     bsl::shared_ptr<ntci::Reactor> result;
 
@@ -410,7 +410,7 @@ bsl::shared_ptr<ntci::Reactor> Interface::acquireReactorUsedByThreadIndex(
 bsl::shared_ptr<ntci::Reactor> Interface::acquireReactorWithLeastLoad(
     const ntca::LoadBalancingOptions& options)
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
 
     NTCI_LOG_CONTEXT();
 
@@ -572,7 +572,7 @@ ntsa::Error Interface::start()
     bsl::shared_ptr<ntci::Resolver> resolver;
 
     {
-        bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+        LockGuard lock(&d_mutex);
 
         if (!d_resolver_sp) {
             BSLS_ASSERT_OPT(!d_config.resolverEnabled().isNull());
@@ -627,7 +627,7 @@ void Interface::shutdown()
     bsl::shared_ptr<ntci::Resolver> resolver;
     ReactorVector                   reactorVector(d_allocator_p);
     {
-        bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+        LockGuard lock(&d_mutex);
 
         resolver      = d_resolver_sp;
         reactorVector = d_reactorVector;
@@ -654,7 +654,7 @@ void Interface::linger()
     ThreadVector  threadVector(d_allocator_p);
     ReactorVector reactorVector(d_allocator_p);
     {
-        bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+        LockGuard lock(&d_mutex);
 
         resolver      = d_resolver_sp;
         threadVector  = d_threadVector;
@@ -690,7 +690,7 @@ void Interface::linger()
     reactorVector.clear();
 
     {
-        bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+        LockGuard lock(&d_mutex);
 
         d_threadVector.clear();
         d_threadMap.clear();
@@ -707,7 +707,7 @@ ntsa::Error Interface::closeAll()
 
     ReactorVector reactorVector(d_allocator_p);
     {
-        bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+        LockGuard lock(&d_mutex);
         reactorVector = d_reactorVector;
     }
 
@@ -1499,7 +1499,7 @@ void Interface::releaseHandleReservation()
 
 bool Interface::expand()
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
 
     NTCI_LOG_CONTEXT();
 
@@ -1520,13 +1520,13 @@ bool Interface::expand()
 
 bsl::size_t Interface::numReactors() const
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
     return d_reactorVector.size();
 }
 
 bsl::size_t Interface::numThreads() const
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
     return d_threadVector.size();
 }
 
@@ -1554,7 +1554,7 @@ bool Interface::lookupByThreadHandle(
     bsl::shared_ptr<ntci::Executor>* result,
     bslmt::ThreadUtil::Handle        threadHandle) const
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
 
     result->reset();
 
@@ -1585,7 +1585,7 @@ bool Interface::lookupByThreadHandle(
 bool Interface::lookupByThreadIndex(bsl::shared_ptr<ntci::Executor>* result,
                                     bsl::size_t threadIndex) const
 {
-    bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
+    LockGuard lock(&d_mutex);
 
     result->reset();
 
diff --git a/groups/ntc/ntcr/ntcr_interface.h b/groups/ntc/ntcr/ntcr_interface.h
index 90581e34..6ad59077 100644
--- a/groups/ntc/ntcr/ntcr_interface.h
+++ b/groups/ntc/ntcr/ntcr_interface.h
@@ -77,28 +77,28 @@ class Interface : public ntci::Interface,
     /// Define a type alias for a vector of reactors.
     typedef bsl::vector<bsl::shared_ptr<ntci::Reactor> > ReactorVector;
 
-    ntccfg::Object d_object;
-
-    mutable ntccfg::Mutex d_mutex;
-
-    bsl::shared_ptr<ntcs::User>     d_user_sp;
-    bsl::shared_ptr<ntci::DataPool> d_dataPool_sp;
-    bsl::shared_ptr<ntci::Resolver> d_resolver_sp;
-
-    bsl::shared_ptr<ntci::Reservation> d_connectionLimiter_sp;
-    bsl::shared_ptr<ntcs::Metrics>     d_socketMetrics_sp;
-
+    /// Define a type alias for a mutex.
+    typedef ntccfg::Mutex Mutex;
+
+    /// Define a type alias for a mutex lock guard.
+    typedef ntccfg::LockGuard LockGuard;
+
+    ntccfg::Object                        d_object;
+    mutable Mutex                         d_mutex;
+    bsl::shared_ptr<ntcs::User>           d_user_sp;
+    bsl::shared_ptr<ntci::DataPool>       d_dataPool_sp;
+    bsl::shared_ptr<ntci::Resolver>       d_resolver_sp;
+    bsl::shared_ptr<ntci::Reservation>    d_connectionLimiter_sp;
+    bsl::shared_ptr<ntcs::Metrics>        d_socketMetrics_sp;
     bsl::shared_ptr<ntci::ReactorFactory> d_reactorFactory_sp;
     bsl::shared_ptr<ntci::ReactorMetrics> d_reactorMetrics_sp;
     ReactorVector                         d_reactorVector;
-
-    ThreadVector     d_threadVector;
-    ThreadMap        d_threadMap;
-    bslmt::Semaphore d_threadSemaphore;
-    bsl::size_t      d_threadWatermark;
-
-    ntca::InterfaceConfig d_config;
-    bslma::Allocator*     d_allocator_p;
+    ThreadVector                          d_threadVector;
+    ThreadMap                             d_threadMap;
+    bslmt::Semaphore                      d_threadSemaphore;
+    bsl::size_t                           d_threadWatermark;
+    ntca::InterfaceConfig                 d_config;
+    bslma::Allocator*                     d_allocator_p;
 
   private:
     Interface(const Interface&) BSLS_KEYWORD_DELETED;