Add a default timeout parameter to HHWheelTimer.

[folly.git] / folly / experimental / FunctionScheduler.cpp

diff --git a/folly/experimental/FunctionScheduler.cpp b/folly/experimental/FunctionScheduler.cpp
index 9a12256ffb84020716336bcdcdb2cf02cd3c4962..e9ea7543c1eb9f4ec3263239f9e1925c8da0b673 100644 (file)
--- a/folly/experimental/FunctionScheduler.cpp
+++ b/folly/experimental/FunctionScheduler.cpp
@@ -19,26 +19,9 @@
 #include <folly/Conv.h>
 #include <folly/String.h>
 
-#ifdef _POSIX_MONOTONIC_CLOCK
-#define FOLLY_TIME_MONOTONIC_CLOCK CLOCK_MONOTONIC
-#else
-#define FOLLY_TIME_MONOTONIC_CLOCK CLOCK_REALTIME
-#endif
-
 using namespace std;
-using std::chrono::seconds;
 using std::chrono::milliseconds;
-
-static milliseconds nowInMS() {
-  struct timespec ts /*= void*/;
-  if (clock_gettime(FOLLY_TIME_MONOTONIC_CLOCK, &ts)) {
-    // Only possible failures are EFAULT or EINVAL, both practically
-    // impossible. But an assert can't hurt.
-    assert(false);
-  }
-  return milliseconds(
-    static_cast<int64_t>(ts.tv_sec * 1000.0 + ts.tv_nsec / 1000000.0 + 0.5));
-}
+using std::chrono::steady_clock;
 
 namespace folly {
 
@@ -55,11 +38,10 @@ void FunctionScheduler::addFunction(const std::function<void()>& cb,
                                     StringPiece nameID,
                                     milliseconds startDelay) {
   LatencyDistribution latencyDistr(false, 0.0);
-  addFunctionInternal(cb, interval,
-                      latencyDistr, nameID, startDelay);
+  addFunction(cb, interval, latencyDistr, nameID, startDelay);
 }
 
-void FunctionScheduler::addFunctionInternal(const std::function<void()>& cb,
+void FunctionScheduler::addFunction(const std::function<void()>& cb,
                                     milliseconds interval,
                                     const LatencyDistribution& latencyDistr,
                                     StringPiece nameID,
@@ -91,7 +73,7 @@ void FunctionScheduler::addFunctionInternal(const std::function<void()>& cb,
   functions_.emplace_back(cb, interval, nameID.str(), startDelay,
                           latencyDistr.isPoisson, latencyDistr.poissonMean);
   if (running_) {
-    functions_.back().setNextRunTime(nowInMS() + startDelay);
+    functions_.back().setNextRunTime(steady_clock::now() + startDelay);
     std::push_heap(functions_.begin(), functions_.end(), fnCmp_);
     // Signal the running thread to wake up and see if it needs to change it's
     // current scheduling decision.
@@ -154,7 +136,7 @@ bool FunctionScheduler::start() {
 
   VLOG(1) << "Starting FunctionScheduler with " << functions_.size()
           << " functions.";
-  milliseconds now(nowInMS());
+  auto now = steady_clock::now();
   // Reset the next run time. for all functions.
   // note: this is needed since one can shutdown() and start() again
   for (auto& f : functions_) {
@@ -198,7 +180,7 @@ void FunctionScheduler::run() {
       continue;
     }
 
-    milliseconds now(nowInMS());
+    auto now = steady_clock::now();
 
     // Move the next function to run to the end of functions_
     std::pop_heap(functions_.begin(), functions_.end(), fnCmp_);
@@ -224,7 +206,7 @@ void FunctionScheduler::run() {
 }
 
 void FunctionScheduler::runOneFunction(std::unique_lock<std::mutex>& lock,
-                                       std::chrono::milliseconds now) {
+                                       steady_clock::time_point now) {
   DCHECK(lock.mutex() == &mutex_);
   DCHECK(lock.owns_lock());