From e65f85577a2d4fa0b8aa428dc141a68977983479 Mon Sep 17 00:00:00 2001
From: Amirsaman Memaripour <amirsaman.memaripour@10gen.com>
Date: Wed, 12 Feb 2020 23:32:09 +0000
Subject: SERVER-46106 Keep read-modify accesses to
 NetworkInterfaceMock::_alarms in one CS

---
 src/mongo/executor/network_interface_mock.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mongo')

diff --git a/src/mongo/executor/network_interface_mock.cpp b/src/mongo/executor/network_interface_mock.cpp
index 86e1144b81e..9f3ccfc25dd 100644
--- a/src/mongo/executor/network_interface_mock.cpp
+++ b/src/mongo/executor/network_interface_mock.cpp
@@ -590,7 +590,9 @@ void NetworkInterfaceMock::signalWorkAvailable() {
 
 void NetworkInterfaceMock::_runReadyNetworkOperations_inlock(stdx::unique_lock<stdx::mutex>* lk) {
     while (!_alarms.empty() && _now_inlock() >= _alarms.top().when) {
-        auto& alarm = _alarms.top();
+        // It's safe to remove the const qualifier here as we immediately remove the top.
+        AlarmInfo alarm = std::move(const_cast<AlarmInfo&>(_alarms.top()));
+        _alarms.pop();
 
         // If the handle isn't cancelled, then run it
         auto iter = _canceledAlarms.find(alarm.handle);
@@ -601,8 +603,6 @@ void NetworkInterfaceMock::_runReadyNetworkOperations_inlock(stdx::unique_lock<s
         } else {
             _canceledAlarms.erase(iter);
         }
-
-        _alarms.pop();
     }
     while (!_scheduled.empty() && _scheduled.front().getResponseDate() <= _now_inlock()) {
         invariant(_currentlyRunning == kNetworkThread);
-- 
cgit v1.2.1