summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaley Chen <waleycz@gmail.com>2016-03-31 11:42:02 -0400
committerWaley Chen <waleycz@gmail.com>2016-03-31 16:47:03 -0400
commitada50f9f409afdccb40038b3ba182bf4e81e0490 (patch)
treeb01fe4e8811cdce62dd2e7dc114ce0fa6ef9e8de
parenta163a5bc065592507cf8270401dd467bc76d4369 (diff)
downloadmongo-ada50f9f409afdccb40038b3ba182bf4e81e0490.tar.gz
SERVER-21170 NetworkInterface::startCommand should be able to reject requests due to shutdown
lint
-rw-r--r--src/mongo/executor/network_interface_impl.h2
-rw-r--r--src/mongo/executor/network_interface_mock.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/executor/network_interface_impl.h b/src/mongo/executor/network_interface_impl.h
index 55c25fe8e57..b2f64c6a971 100644
--- a/src/mongo/executor/network_interface_impl.h
+++ b/src/mongo/executor/network_interface_impl.h
@@ -160,7 +160,7 @@ private:
bool _isExecutorRunnable = false;
// Flag indicating when this interface is being shut down (because shutdown() has executed).
- std::atomic<bool> _inShutdown;
+ AtomicWord<bool> _inShutdown;
// Interface for running remote commands
RemoteCommandRunnerImpl _commandRunner;
diff --git a/src/mongo/executor/network_interface_mock.h b/src/mongo/executor/network_interface_mock.h
index b785ece5a97..4a9173f1954 100644
--- a/src/mongo/executor/network_interface_mock.h
+++ b/src/mongo/executor/network_interface_mock.h
@@ -291,7 +291,7 @@ private:
bool _hasStarted; // (M)
// Set to true by "shutDown()".
- std::atomic<bool> _inShutdown; // (M)
+ AtomicWord<bool> _inShutdown; // (M)
// Next date that the executor expects to wake up at (due to a scheduleWorkAt() call).
Date_t _executorNextWakeupDate; // (M)