FastOS_Time -> std::chrono.

4 files changed, 11 insertions, 13 deletions

diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
index ff4b2e98cca..938ca63b50f 100644
--- a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
+++ b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
@@ -28,7 +28,7 @@ DistributorProcess::shutdown()
 }
 
 void
-DistributorProcess::setupConfig(uint64_t subscribeTimeout)
+DistributorProcess::setupConfig(milliseconds subscribeTimeout)
 {
     using vespa::config::content::core::StorServerConfig;
     using vespa::config::content::core::StorDistributormanagerConfig;
@@ -39,13 +39,10 @@ DistributorProcess::setupConfig(uint64_t subscribeTimeout)
     if (stor_config->persistenceProvider.type != StorServerConfig::PersistenceProvider::Type::STORAGE) {
         _activeFlag = DistributorNode::NEED_ACTIVE_BUCKET_STATES_SET;
     }
-    auto dist_config = config::ConfigGetter<StorDistributormanagerConfig>::getConfig(
-            _configUri.getConfigId(), _configUri.getContext(), subscribeTimeout);
+    auto dist_config = config::ConfigGetter<StorDistributormanagerConfig>::getConfig(_configUri.getConfigId(), _configUri.getContext(), subscribeTimeout);
     _use_btree_database = dist_config->useBtreeDatabase;
-    _distributorConfigHandler
-            = _configSubscriber.subscribe<StorDistributormanagerConfig>(_configUri.getConfigId(), subscribeTimeout);
-    _visitDispatcherConfigHandler
-            = _configSubscriber.subscribe<StorVisitordispatcherConfig>(_configUri.getConfigId(), subscribeTimeout);
+    _distributorConfigHandler = _configSubscriber.subscribe<StorDistributormanagerConfig>(_configUri.getConfigId(), subscribeTimeout);
+    _visitDispatcherConfigHandler = _configSubscriber.subscribe<StorVisitordispatcherConfig>(_configUri.getConfigId(), subscribeTimeout);
     Process::setupConfig(subscribeTimeout);
 }
 
diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.h b/storageserver/src/vespa/storageserver/app/distributorprocess.h
index 57193f77e42..48fa331ba54 100644
--- a/storageserver/src/vespa/storageserver/app/distributorprocess.h
+++ b/storageserver/src/vespa/storageserver/app/distributorprocess.h
@@ -27,7 +27,7 @@ public:
     ~DistributorProcess() override;
 
     void shutdown() override;
-    void setupConfig(uint64_t subscribeTimeout) override;
+    void setupConfig(milliseconds subscribeTimeout) override;
     void createNode() override;
     bool configUpdated() override;
     void updateConfig() override;
diff --git a/storageserver/src/vespa/storageserver/app/process.cpp b/storageserver/src/vespa/storageserver/app/process.cpp
index 0ebce27eebb..df5e8f4a10e 100644
--- a/storageserver/src/vespa/storageserver/app/process.cpp
+++ b/storageserver/src/vespa/storageserver/app/process.cpp
@@ -19,7 +19,7 @@ Process::Process(const config::ConfigUri & configUri)
 { }
 
 void
-Process::setupConfig(uint64_t subscribeTimeout)
+Process::setupConfig(milliseconds subscribeTimeout)
 {
     _documentHandler = _configSubscriber.subscribe<document::DocumenttypesConfig>(_configUri.getConfigId(), subscribeTimeout);
     if (!_configSubscriber.nextConfig()) {
@@ -32,7 +32,7 @@ Process::setupConfig(uint64_t subscribeTimeout)
 bool
 Process::configUpdated()
 {
-    _configSubscriber.nextGeneration(0);
+    _configSubscriber.nextGenerationNow();
     if (_documentHandler->isChanged()) {
         LOG(info, "Document config detected changed");
         return true;
diff --git a/storageserver/src/vespa/storageserver/app/process.h b/storageserver/src/vespa/storageserver/app/process.h
index e8f7fd62ccf..a5c5b656677 100644
--- a/storageserver/src/vespa/storageserver/app/process.h
+++ b/storageserver/src/vespa/storageserver/app/process.h
@@ -38,12 +38,13 @@ private:
     std::vector<DocumentTypeRepoSP> _repos;
 
 public:
-    typedef std::unique_ptr<Process> UP;
+    using UP = std::unique_ptr<Process>;
+    using milliseconds = std::chrono::milliseconds;
 
     Process(const config::ConfigUri & configUri);
     virtual ~Process() {}
 
-    virtual void setupConfig(uint64_t subscribeTimeout);
+    virtual void setupConfig(milliseconds subscribeTimeout);
     virtual void createNode() = 0;
     virtual bool configUpdated();
     virtual void updateConfig();
@@ -54,7 +55,7 @@ public:
     virtual StorageNode& getNode() = 0;
     virtual StorageNodeContext& getContext() = 0;
 
-    virtual int64_t getGeneration() const override;
+    int64_t getGeneration() const override;
 };
 
 } // storage