1 files changed, 11 insertions, 11 deletions

diff --git a/src/mongo/transport/transport_layer_asio_test.cpp b/src/mongo/transport/transport_layer_asio_test.cpp
index 08dcd99dcae..53f979d9cd8 100644
--- a/src/mongo/transport/transport_layer_asio_test.cpp
+++ b/src/mongo/transport/transport_layer_asio_test.cpp
@@ -48,7 +48,7 @@ namespace {
 class ServiceEntryPointUtil : public ServiceEntryPoint {
 public:
     void startSession(transport::SessionHandle session) override {
-        stdx::unique_lock<stdx::mutex> lk(_mutex);
+        stdx::unique_lock<Latch> lk(_mutex);
         _sessions.push_back(std::move(session));
         log() << "started session";
         _cv.notify_one();
@@ -58,7 +58,7 @@ public:
         log() << "end all sessions";
         std::vector<transport::SessionHandle> old_sessions;
         {
-            stdx::unique_lock<stdx::mutex> lock(_mutex);
+            stdx::unique_lock<Latch> lock(_mutex);
             old_sessions.swap(_sessions);
         }
         old_sessions.clear();
@@ -75,7 +75,7 @@ public:
     void appendStats(BSONObjBuilder*) const override {}
 
     size_t numOpenSessions() const override {
-        stdx::unique_lock<stdx::mutex> lock(_mutex);
+        stdx::unique_lock<Latch> lock(_mutex);
         return _sessions.size();
     }
 
@@ -88,12 +88,12 @@ public:
     }
 
     void waitForConnect() {
-        stdx::unique_lock<stdx::mutex> lock(_mutex);
+        stdx::unique_lock<Latch> lock(_mutex);
         _cv.wait(lock, [&] { return !_sessions.empty(); });
     }
 
 private:
-    mutable stdx::mutex _mutex;
+    mutable Mutex _mutex = MONGO_MAKE_LATCH("::_mutex");
     stdx::condition_variable _cv;
     std::vector<transport::SessionHandle> _sessions;
     transport::TransportLayer* _transport = nullptr;
@@ -107,7 +107,7 @@ public:
             SockAddr sa{"localhost", _port, AF_INET};
             s.connect(sa);
             log() << "connection: port " << _port;
-            stdx::unique_lock<stdx::mutex> lk(_mutex);
+            stdx::unique_lock<Latch> lk(_mutex);
             _cv.wait(lk, [&] { return _stop; });
             log() << "connection: Rx stop request";
         }};
@@ -115,7 +115,7 @@ public:
 
     void stop() {
         {
-            stdx::unique_lock<stdx::mutex> lk(_mutex);
+            stdx::unique_lock<Latch> lk(_mutex);
             _stop = true;
         }
         log() << "connection: Tx stop request";
@@ -125,7 +125,7 @@ public:
     }
 
 private:
-    stdx::mutex _mutex;
+    Mutex _mutex = MONGO_MAKE_LATCH("SimpleConnectionThread::_mutex");
     stdx::condition_variable _cv;
     stdx::thread _thr;
     bool _stop = false;
@@ -196,7 +196,7 @@ public:
     }
 
     bool waitForTimeout(boost::optional<Milliseconds> timeout = boost::none) {
-        stdx::unique_lock<stdx::mutex> lk(_mutex);
+        stdx::unique_lock<Latch> lk(_mutex);
         bool ret = true;
         if (timeout) {
             ret = _cond.wait_for(lk, timeout->toSystemDuration(), [this] { return _finished; });
@@ -210,7 +210,7 @@ public:
 
 protected:
     void notifyComplete() {
-        stdx::unique_lock<stdx::mutex> lk(_mutex);
+        stdx::unique_lock<Latch> lk(_mutex);
         _finished = true;
         _cond.notify_one();
     }
@@ -221,7 +221,7 @@ protected:
     }
 
 private:
-    stdx::mutex _mutex;
+    Mutex _mutex = MONGO_MAKE_LATCH("TimeoutSEP::_mutex");
 
     stdx::condition_variable _cond;
     bool _finished = false;