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/scripting | |
| 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/scripting')
| -rw-r--r-- | src/mongo/scripting/deadline_monitor.h | 2 | ||||
| -rw-r--r-- | src/mongo/scripting/mozjs/PosixNSPR.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/scripting/mozjs/countdownlatch.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/scripting/mozjs/jsthread.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/scripting/mozjs/proxyscope.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/scripting/deadline_monitor.h b/src/mongo/scripting/deadline_monitor.h index 39862ebf58c..40c8217cb07 100644 --- a/src/mongo/scripting/deadline_monitor.h +++ b/src/mongo/scripting/deadline_monitor.h @@ -31,8 +31,8 @@ #include <cstdint> #include "mongo/platform/atomic_word.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/stdx/unordered_map.h" #include "mongo/util/concurrency/idle_thread_block.h" diff --git a/src/mongo/scripting/mozjs/PosixNSPR.cpp b/src/mongo/scripting/mozjs/PosixNSPR.cpp index 6df76f4ef13..77f0aedd07f 100644 --- a/src/mongo/scripting/mozjs/PosixNSPR.cpp +++ b/src/mongo/scripting/mozjs/PosixNSPR.cpp @@ -17,9 +17,9 @@ #include <js/Utility.h> #include <vm/PosixNSPR.h> -#include "mongo/platform/condition_variable.h" #include "mongo/platform/mutex.h" #include "mongo/stdx/chrono.h" +#include "mongo/stdx/condition_variable.h" #include "mongo/stdx/thread.h" #include "mongo/util/concurrency/thread_name.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/scripting/mozjs/countdownlatch.cpp b/src/mongo/scripting/mozjs/countdownlatch.cpp index f50735c734c..d9100b4bde0 100644 --- a/src/mongo/scripting/mozjs/countdownlatch.cpp +++ b/src/mongo/scripting/mozjs/countdownlatch.cpp @@ -31,10 +31,10 @@ #include "mongo/scripting/mozjs/countdownlatch.h" -#include "mongo/platform/condition_variable.h" #include "mongo/platform/mutex.h" #include "mongo/scripting/mozjs/implscope.h" #include "mongo/scripting/mozjs/objectwrapper.h" +#include "mongo/stdx/condition_variable.h" #include "mongo/stdx/unordered_map.h" namespace mongo { diff --git a/src/mongo/scripting/mozjs/jsthread.cpp b/src/mongo/scripting/mozjs/jsthread.cpp index fcd3549d21e..d39172bb02b 100644 --- a/src/mongo/scripting/mozjs/jsthread.cpp +++ b/src/mongo/scripting/mozjs/jsthread.cpp @@ -38,11 +38,11 @@ #include <vm/PosixNSPR.h> #include "mongo/db/jsobj.h" -#include "mongo/platform/condition_variable.h" #include "mongo/platform/mutex.h" #include "mongo/scripting/mozjs/implscope.h" #include "mongo/scripting/mozjs/valuereader.h" #include "mongo/scripting/mozjs/valuewriter.h" +#include "mongo/stdx/condition_variable.h" #include "mongo/stdx/thread.h" #include "mongo/util/log.h" #include "mongo/util/stacktrace.h" diff --git a/src/mongo/scripting/mozjs/proxyscope.h b/src/mongo/scripting/mozjs/proxyscope.h index 8d3269c7474..85be843b22d 100644 --- a/src/mongo/scripting/mozjs/proxyscope.h +++ b/src/mongo/scripting/mozjs/proxyscope.h @@ -32,9 +32,9 @@ #include "vm/PosixNSPR.h" #include "mongo/client/dbclient_cursor.h" -#include "mongo/platform/condition_variable.h" #include "mongo/platform/mutex.h" #include "mongo/scripting/mozjs/engine.h" +#include "mongo/stdx/condition_variable.h" #include "mongo/stdx/thread.h" #include "mongo/util/functional.h" |