time(0) to chrono::steady_clock.

6 files changed, 21 insertions, 19 deletions

diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp
index 2308102506b..4edcedf7dd4 100644
--- a/metrics/src/vespa/metrics/metricmanager.cpp
+++ b/metrics/src/vespa/metrics/metricmanager.cpp
@@ -27,6 +27,11 @@ typedef MetricsmanagerConfig Config;
 MetricManager::ConsumerSpec::ConsumerSpec() = default;
 MetricManager::ConsumerSpec::~ConsumerSpec() = default;
 
+time_t
+MetricManager::Timer::getTime() const {
+    return std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now().time_since_epoch()).count();
+}
+
 void
 MetricManager::assertMetricLockLocked(const MetricLockGuard& g) const {
     if (!g.monitors(_waiter)) {
@@ -327,7 +332,7 @@ namespace {
     {
         LOG(spam, "Adding metrics for consumer %s", c.name.c_str());
     }
-    ConsumerMetricBuilder::~ConsumerMetricBuilder() { }
+    ConsumerMetricBuilder::~ConsumerMetricBuilder() = default;
 
 }
 
diff --git a/metrics/src/vespa/metrics/metricmanager.h b/metrics/src/vespa/metrics/metricmanager.h
index 3b8de5927ec..f2b2926873f 100644
--- a/metrics/src/vespa/metrics/metricmanager.h
+++ b/metrics/src/vespa/metrics/metricmanager.h
@@ -70,7 +70,7 @@ public:
 
     struct Timer {
         virtual ~Timer() {}
-        virtual time_t getTime() const { return time(0); }
+        virtual time_t getTime() const;
         virtual time_t getTimeInMilliSecs() const { return getTime() * 1000; }
     };
 
@@ -85,7 +85,7 @@ public:
         ConsumerSpec(ConsumerSpec &&) = default;
         ConsumerSpec & operator= (ConsumerSpec &&) = default;
         ConsumerSpec();
-        ~ConsumerSpec();
+        ~ConsumerSpec() override;
 
         bool contains(const Metric& m) const {
             return (includedMetrics.find(m.getPath()) != includedMetrics.end());
@@ -126,8 +126,8 @@ private:
     LongAverageMetric _sleepTimes;
 
 public:
-    MetricManager(std::unique_ptr<Timer> timer = std::unique_ptr<Timer>(new Timer));
-    ~MetricManager();
+    MetricManager(std::unique_ptr<Timer> timer = std::make_unique<Timer>());
+    ~MetricManager() override;
 
     void stop();
 
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index a56104ff717..d1631c50880 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -1273,10 +1273,10 @@ FileStorHandlerImpl::Stripe::dumpQueueHtml(std::ostream & os) const
 namespace {
 
 void dump_lock_entry(const document::BucketId& bucketId, const FileStorHandlerImpl::Stripe::LockEntry& entry,
-                     api::LockingRequirements lock_mode, uint32_t now_ts, std::ostream& os) {
+                     api::LockingRequirements lock_mode, FileStorHandlerImpl::Clock::time_point now_ts, std::ostream& os) {
     os << api::MessageType::get(entry.msgType).getName() << ":" << entry.msgId << " ("
        << bucketId << ", " << api::to_string(lock_mode)
-       << " lock) Running for " << (now_ts - entry.timestamp) << " secs<br/>\n";
+       << " lock) Running for " << std::chrono::duration_cast<std::chrono::seconds>(now_ts - entry.timestamp).count() << " secs<br/>\n";
 }
 
 }
@@ -1284,7 +1284,7 @@ void dump_lock_entry(const document::BucketId& bucketId, const FileStorHandlerIm
 void
 FileStorHandlerImpl::Stripe::dumpActiveHtml(std::ostream & os) const
 {
-    uint32_t now = time(nullptr);
+    Clock::time_point now = Clock::now();
     vespalib::MonitorGuard guard(_lock);
     for (const auto & e : _lockedBuckets) {
         if (e.second._exclusiveLock) {
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h
index d46aa635354..fd6ab5e8b9a 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h
@@ -72,21 +72,22 @@ public:
 
     using PriorityIdx = bmi::nth_index<PriorityQueue, 1>::type;
     using BucketIdx = bmi::nth_index<PriorityQueue, 2>::type;
+    using Clock = std::chrono::steady_clock;
 
     struct Disk;
 
     class Stripe {
     public:
         struct LockEntry {
-            uint32_t                timestamp;
+            Clock::time_point       timestamp;
             uint8_t                 priority;
             api::MessageType::Id    msgType;
             api::StorageMessage::Id msgId;
 
-            LockEntry() : timestamp(0), priority(0), msgType(), msgId(0) { }
+            LockEntry() : timestamp(), priority(0), msgType(), msgId(0) { }
 
             LockEntry(uint8_t priority_, api::MessageType::Id msgType_, api::StorageMessage::Id msgId_)
-                : timestamp(time(nullptr)), priority(priority_), msgType(msgType_), msgId(msgId_)
+                : timestamp(Clock::now()), priority(priority_), msgType(msgType_), msgId(msgId_)
             { }
         };
 
diff --git a/storage/src/vespa/storage/storageserver/storagenode.cpp b/storage/src/vespa/storage/storageserver/storagenode.cpp
index 64c0970cf9d..c5a0a031067 100644
--- a/storage/src/vespa/storage/storageserver/storagenode.cpp
+++ b/storage/src/vespa/storage/storageserver/storagenode.cpp
@@ -161,10 +161,10 @@ StorageNode::initialize()
     _context.getComponentRegister().setBucketSpacesConfig(*_bucketSpacesConfig);
 
     _metrics = std::make_shared<StorageMetricSet>();
-    _component.reset(new StorageComponent(_context.getComponentRegister(), "storagenode"));
+    _component = std::make_unique<StorageComponent>(_context.getComponentRegister(), "storagenode");
     _component->registerMetric(*_metrics);
     if (!_context.getComponentRegister().hasMetricManager()) {
-        _metricManager.reset(new metrics::MetricManager);
+        _metricManager = std::make_unique<metrics::MetricManager>();
         _context.getComponentRegister().setMetricManager(*_metricManager);
     }
     _component->registerMetricUpdateHook(*this, framework::SecondTime(300));
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/clock/realclock.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/clock/realclock.cpp
index f8c3c2a3f99..810eced1b3e 100644
--- a/storageframework/src/vespa/storageframework/defaultimplementation/clock/realclock.cpp
+++ b/storageframework/src/vespa/storageframework/defaultimplementation/clock/realclock.cpp
@@ -3,9 +3,7 @@
 #include "realclock.h"
 #include <sys/time.h>
 
-namespace storage {
-namespace framework {
-namespace defaultimplementation {
+namespace storage::framework::defaultimplementation {
 
 MicroSecTime RealClock::getTimeInMicros() const {
     struct timeval mytime;
@@ -30,6 +28,4 @@ MonotonicTimePoint RealClock::getMonotonicTime() const {
     return std::chrono::steady_clock::now();
 }
 
-} // defaultimplementation
-} // framework
-} // storage
+}