SERVER-23243 Replace Listener::getElapsedTimeMillis() in elapsed_tracker.cpp

2 files changed, 20 insertions, 1 deletions

diff --git a/src/mongo/db/query/plan_yield_policy.cpp b/src/mongo/db/query/plan_yield_policy.cpp
index b03ec44920b..575ebf664b8 100644
--- a/src/mongo/db/query/plan_yield_policy.cpp
+++ b/src/mongo/db/query/plan_yield_policy.cpp
@@ -35,16 +35,28 @@
 #include "mongo/db/operation_context.h"
 #include "mongo/db/query/query_knobs.h"
 #include "mongo/db/query/query_yield.h"
+#include "mongo/db/service_context.h"
 #include "mongo/util/scopeguard.h"
+#include "mongo/util/time_support.h"
 
 namespace mongo {
 
 PlanYieldPolicy::PlanYieldPolicy(PlanExecutor* exec, PlanExecutor::YieldPolicy policy)
     : _policy(policy),
       _forceYield(false),
-      _elapsedTracker(internalQueryExecYieldIterations, internalQueryExecYieldPeriodMS),
+      _elapsedTracker(exec->getOpCtx()->getServiceContext()->getFastClockSource(),
+                      internalQueryExecYieldIterations,
+                      Milliseconds(internalQueryExecYieldPeriodMS)),
       _planYielding(exec) {}
 
+
+PlanYieldPolicy::PlanYieldPolicy(PlanExecutor::YieldPolicy policy, ClockSource* cs)
+    : _policy(policy),
+      _forceYield(false),
+      _elapsedTracker(
+          cs, internalQueryExecYieldIterations, Milliseconds(internalQueryExecYieldPeriodMS)),
+      _planYielding(nullptr) {}
+
 bool PlanYieldPolicy::shouldYield() {
     if (!allowedToYield())
         return false;
diff --git a/src/mongo/db/query/plan_yield_policy.h b/src/mongo/db/query/plan_yield_policy.h
index 0de47c608cd..ec6dca7a0f2 100644
--- a/src/mongo/db/query/plan_yield_policy.h
+++ b/src/mongo/db/query/plan_yield_policy.h
@@ -34,6 +34,7 @@
 
 namespace mongo {
 
+class ClockSource;
 class RecordFetcher;
 
 class PlanYieldPolicy {
@@ -44,6 +45,12 @@ public:
      * locks.
      */
     PlanYieldPolicy(PlanExecutor* exec, PlanExecutor::YieldPolicy policy);
+    /**
+     * Only used in dbtests since we don't have access to a PlanExecutor. Since we don't have
+     * access to the PlanExecutor to grab a ClockSource from, we pass in a ClockSource directly
+     * in the constructor instead.
+     */
+    PlanYieldPolicy(PlanExecutor::YieldPolicy policy, ClockSource* cs);
 
     /**
      * Used by YIELD_AUTO plan executors in order to check whether it is time to yield.