diff options
author | Amirsaman Memaripour <amirsaman.memaripour@10gen.com> | 2020-02-12 23:32:09 +0000 |
---|---|---|
committer | evergreen <evergreen@mongodb.com> | 2020-02-12 23:32:09 +0000 |
commit | e65f85577a2d4fa0b8aa428dc141a68977983479 (patch) | |
tree | 2221a907601c0f135fb78079beec30385e3d4be6 /src/mongo | |
parent | 0a4a011397d7e399cbe93a2e2da60aec84997533 (diff) | |
download | mongo-e65f85577a2d4fa0b8aa428dc141a68977983479.tar.gz |
SERVER-46106 Keep read-modify accesses to NetworkInterfaceMock::_alarms in one CS
Diffstat (limited to 'src/mongo')
-rw-r--r-- | src/mongo/executor/network_interface_mock.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); |