diff options
| author | Ben Caimano <ben.caimano@mongodb.com> | 2019-10-21 20:04:47 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2019-10-21 20:04:47 +0000 |
| commit | b641599cf48d33bc79a4131ac8a8f5018dea83c4 (patch) | |
| tree | 50500c6436bdb90ae0893fee20541cffeb4538ce /src/mongo/db/ftdc | |
| parent | a843d5a714e415e128916e49b76e2b2d333bb5d8 (diff) | |
| download | mongo-b641599cf48d33bc79a4131ac8a8f5018dea83c4.tar.gz | |
SERVER-42967 SERVER-42895 SERVER-44086 Expand DiagnosticInfo hooks in Interruptible and Mutex
This commit:
- Adds Listener hooks for Interruptible
- Expands Listener hooks for Mutex
- Updates the DiagnosticInfo and its tests to use the new hooks
- Removes stacktracing pieces from DiagnosticInfo and its tests
- Removes mongo::ConditionVariable entirely in favor of Interruptible
Diffstat (limited to 'src/mongo/db/ftdc')
| -rw-r--r-- | src/mongo/db/ftdc/controller.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/ftdc/controller.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/ftdc/controller.cpp b/src/mongo/db/ftdc/controller.cpp index 11f80503acd..947fd004dfe 100644 --- a/src/mongo/db/ftdc/controller.cpp +++ b/src/mongo/db/ftdc/controller.cpp @@ -39,8 +39,8 @@ #include "mongo/db/ftdc/collector.h" #include "mongo/db/ftdc/util.h" #include "mongo/db/jsobj.h" -#include "mongo/platform/condition_variable.h" #include "mongo/platform/mutex.h" +#include "mongo/stdx/condition_variable.h" #include "mongo/stdx/thread.h" #include "mongo/util/concurrency/idle_thread_block.h" #include "mongo/util/exit.h" diff --git a/src/mongo/db/ftdc/controller.h b/src/mongo/db/ftdc/controller.h index 949117cbc79..50d6ae48886 100644 --- a/src/mongo/db/ftdc/controller.h +++ b/src/mongo/db/ftdc/controller.h @@ -37,8 +37,8 @@ #include "mongo/db/ftdc/config.h" #include "mongo/db/ftdc/file_manager.h" #include "mongo/db/jsobj.h" -#include "mongo/platform/condition_variable.h" #include "mongo/platform/mutex.h" +#include "mongo/stdx/condition_variable.h" #include "mongo/stdx/thread.h" namespace mongo { |