Add a base vespa timer frequency that is used as a base to control poll frequency of various tasks.

2 files changed, 14 insertions, 13 deletions

diff --git a/config/src/vespa/config/subscription/configsubscriptionset.cpp b/config/src/vespa/config/subscription/configsubscriptionset.cpp
index 9ad4dfe3f9d..28eb8463ca7 100644
--- a/config/src/vespa/config/subscription/configsubscriptionset.cpp
+++ b/config/src/vespa/config/subscription/configsubscriptionset.cpp
@@ -17,7 +17,8 @@ using namespace std::chrono;
 namespace config {
 
 ConfigSubscriptionSet::ConfigSubscriptionSet(std::shared_ptr<IConfigContext> context)
-    : _context(std::move(context)),
+    : _maxNapTime(vespalib::from_s(10*1.0/vespalib::getVespaTimerHz())), //10x slower than default timer frequency.
+      _context(std::move(context)),
       _mgr(_context->getManagerInstance()),
       _currentGeneration(-1),
       _subscriptionList(),
@@ -30,7 +31,7 @@ ConfigSubscriptionSet::~ConfigSubscriptionSet()
 }
 
 bool
-ConfigSubscriptionSet::acquireSnapshot(milliseconds timeoutInMillis, bool ignoreChange)
+ConfigSubscriptionSet::acquireSnapshot(vespalib::duration timeout, bool ignoreChange)
 {
     if (_state == CLOSED) {
         return false;
@@ -39,7 +40,7 @@ ConfigSubscriptionSet::acquireSnapshot(milliseconds timeoutInMillis, bool ignore
     }
 
     steady_clock::time_point startTime = steady_clock::now();
-    milliseconds timeLeft = timeoutInMillis;
+    vespalib::duration timeLeft = timeout;
     int64_t lastGeneration = _currentGeneration;
     bool inSync = false;
 
@@ -53,7 +54,7 @@ ConfigSubscriptionSet::acquireSnapshot(milliseconds timeoutInMillis, bool ignore
         // Run nextUpdate on all subscribers to get them in sync.
         for (const auto & subscription : _subscriptionList) {
 
-            if (!subscription->nextUpdate(_currentGeneration, timeLeft) && !subscription->hasGenerationChanged()) {
+            if (!subscription->nextUpdate(_currentGeneration, duration_cast<milliseconds>(timeLeft)) && !subscription->hasGenerationChanged()) {
                 subscription->reset();
                 continue;
             }
@@ -76,13 +77,13 @@ ConfigSubscriptionSet::acquireSnapshot(milliseconds timeoutInMillis, bool ignore
                 generationsInSync = false;
             }
             // Adjust timeout
-            timeLeft = timeoutInMillis - duration_cast<milliseconds>(steady_clock::now() - startTime);
+            timeLeft = timeout - (steady_clock::now() - startTime);
         }
         inSync = generationsInSync && (_subscriptionList.size() == numGenerationChanged) && (ignoreChange || numChanged > 0);
         lastGeneration = generation;
-        timeLeft = timeoutInMillis - duration_cast<milliseconds>(steady_clock::now() - startTime);
+        timeLeft = timeout - (steady_clock::now() - startTime);
         if (!inSync && (timeLeft.count() > 0)) {
-            std::this_thread::sleep_for(std::chrono::milliseconds(std::min(INT64_C(10), timeLeft.count())));
+            std::this_thread::sleep_for(std::min(_maxNapTime, timeLeft));
         } else {
             break;
         }
@@ -123,14 +124,14 @@ ConfigSubscriptionSet::isClosed() const
 }
 
 std::shared_ptr<ConfigSubscription>
-ConfigSubscriptionSet::subscribe(const ConfigKey & key, milliseconds timeoutInMillis)
+ConfigSubscriptionSet::subscribe(const ConfigKey & key, vespalib::duration timeout)
 {
     if (_state != OPEN) {
         throw ConfigRuntimeException("Adding subscription after calling nextConfig() is not allowed");
     }
     LOG(debug, "Subscribing with config Id(%s), defName(%s)", key.getConfigId().c_str(), key.getDefName().c_str());
 
-    std::shared_ptr<ConfigSubscription> s = _mgr.subscribe(key, timeoutInMillis);
+    std::shared_ptr<ConfigSubscription> s = _mgr.subscribe(key, duration_cast<milliseconds>(timeout));
     _subscriptionList.push_back(s);
     return s;
 }
diff --git a/config/src/vespa/config/subscription/configsubscriptionset.h b/config/src/vespa/config/subscription/configsubscriptionset.h
index 89c74a97be2..9cee3894aa9 100644
--- a/config/src/vespa/config/subscription/configsubscriptionset.h
+++ b/config/src/vespa/config/subscription/configsubscriptionset.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #include "subscriptionid.h"
+#include <vespa/vespalib/util/time.h>
 #include <atomic>
-#include <chrono>
 #include <memory>
 #include <vector>
 
@@ -21,7 +21,6 @@ class ConfigKey;
 class ConfigSubscriptionSet
 {
 public:
-    using milliseconds = std::chrono::milliseconds;
     /**
      * Constructs a new ConfigSubscriptionSet object which can be used to subscribe for 1
      * or more configs from a specific source.
@@ -53,16 +52,17 @@ public:
     bool isClosed() const;
 
     // Helpers for doing the subscription
-    std::shared_ptr<ConfigSubscription> subscribe(const ConfigKey & key, milliseconds timeoutInMillis);
+    std::shared_ptr<ConfigSubscription> subscribe(const ConfigKey & key, vespalib::duration timeout);
 
     // Tries to acquire a new snapshot of config within the timeout
-    bool acquireSnapshot(milliseconds timeoutInMillis, bool requireDifference);
+    bool acquireSnapshot(vespalib::duration timeout, bool requireDifference);
 
 private:
     // Describes the state of the subscriber.
     enum SubscriberState { OPEN, FROZEN, CONFIGURED, CLOSED };
     using SubscriptionList = std::vector<std::shared_ptr<ConfigSubscription>>;
 
+    const vespalib::duration        _maxNapTime;
     std::shared_ptr<IConfigContext> _context;             // Context to keep alive managers.
     IConfigManager &                _mgr;                 // The config manager that we use.
     int64_t                         _currentGeneration;   // Holds the current config generation.