From fe0a337c02188796babd4dc17eab637ed292eea9 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sat, 2 Dec 2023 20:40:42 -0500 Subject: [PATCH] core: `chrono::steady_clock::now()` is static --- ndn-svs/core.cpp | 7 +++++-- ndn-svs/core.hpp | 3 --- ndn-svs/svspubsub.cpp | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ndn-svs/core.cpp b/ndn-svs/core.cpp index b89b7ed..92e09ae 100644 --- a/ndn-svs/core.cpp +++ b/ndn-svs/core.cpp @@ -22,6 +22,8 @@ #include #include +#include + #ifdef NDN_SVS_COMPRESSION #include #include @@ -45,7 +47,8 @@ SVSyncCore::SVSyncCore(ndn::Face& face, , m_periodicSyncTime(30_s) , m_periodicSyncJitter(0.1) , m_rng(ndn::random::getRandomNumberEngine()) - , m_retxDist(m_periodicSyncTime.count() * (1.0 - m_periodicSyncJitter), m_periodicSyncTime.count() * (1.0 + m_periodicSyncJitter)) + , m_retxDist(m_periodicSyncTime.count() * (1.0 - m_periodicSyncJitter), + m_periodicSyncTime.count() * (1.0 + m_periodicSyncJitter)) , m_intrReplyDist(0, m_maxSuppressionTime.count()) , m_keyChainMem("pib-memory:", "tpm-memory:") , m_scheduler(m_face.getIoContext()) @@ -382,7 +385,7 @@ long SVSyncCore::getCurrentTime() const { return std::chrono::duration_cast( - m_steadyClock.now().time_since_epoch()).count(); + std::chrono::steady_clock::now().time_since_epoch()).count(); } bool diff --git a/ndn-svs/core.hpp b/ndn-svs/core.hpp index 906c3e3..43b88bd 100644 --- a/ndn-svs/core.hpp +++ b/ndn-svs/core.hpp @@ -25,7 +25,6 @@ #include #include -#include #include namespace ndn::svs { @@ -287,8 +286,6 @@ class SVSyncCore : noncopyable scheduler::ScopedEventId m_retxEvent; scheduler::ScopedEventId m_packetEvent; - std::chrono::steady_clock m_steadyClock; - // Time at which the next sync interest will be sent std::atomic_long m_nextSyncInterest; diff --git a/ndn-svs/svspubsub.cpp b/ndn-svs/svspubsub.cpp index 52347bb..30c0e4e 100644 --- a/ndn-svs/svspubsub.cpp +++ b/ndn-svs/svspubsub.cpp @@ -18,6 +18,8 @@ #include +#include + namespace ndn::svs { SVSPubSub::SVSPubSub(const Name& syncPrefix,