janis/aes67-daemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use steady_clock instead of high_resolution_clock to avoid being affected by date/time changes

Browse Source
This commit is contained in:
Andrea Bondavalli 2020-03-02 19:06:21 +01:00
parent c62ccdb808
commit f57046a478
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
daemon/session_manager.cpp
View File

@ -33,6 +33,7 @@
#include "log.hpp" #include "log.hpp"
#include "session_manager.hpp" #include "session_manager.hpp"
static uint8_t get_codec_word_lenght(const std::string& codec) { static uint8_t get_codec_word_lenght(const std::string& codec) {
if (codec == "L16") { if (codec == "L16") {
return 2; return 2;
@ -902,16 +903,15 @@ size_t SessionManager::process_sap() {
return sdp_len_sum; return sdp_len_sum;
} }
using namespace std::chrono;
using second_t = duration<double, std::ratio<1> >;
bool SessionManager::worker() { bool SessionManager::worker() {
using clock_ = std::chrono::high_resolution_clock;
using second_t = std::chrono::duration<double, std::ratio<1> >;
using timepoint_t = std::chrono::time_point<clock_>;
TPTPConfig ptp_config; TPTPConfig ptp_config;
TPTPStatus ptp_status; TPTPStatus ptp_status;
timepoint_t sap_timepoint = clock_::now(); auto sap_timepoint = steady_clock::now();
timepoint_t ptp_timepoint = clock_::now(); auto ptp_timepoint = steady_clock::now();
int sap_interval = 1; int sap_interval = 1;
int ptp_interval = 0; int ptp_interval = 0;
@ -922,9 +922,9 @@ bool SessionManager::worker() {
while (running_) { while (running_) {
// check if it's time to update the PTP status // check if it's time to update the PTP status
if (std::chrono::duration_cast<second_t> (clock_::now() - ptp_timepoint).count() > if ((duration_cast<second_t>(steady_clock::now() - ptp_timepoint).count())
ptp_interval) { > ptp_interval) {
ptp_timepoint = clock_::now(); ptp_timepoint = steady_clock::now();
if (driver_->get_ptp_config(ptp_config) || if (driver_->get_ptp_config(ptp_config) ||
driver_->get_ptp_status(ptp_status)) { driver_->get_ptp_status(ptp_status)) {
BOOST_LOG_TRIVIAL(error) BOOST_LOG_TRIVIAL(error)
@ -972,10 +972,10 @@ bool SessionManager::worker() {
ptp_interval = 10; ptp_interval = 10;
} }
// check if it's time to send SAP announcements // check if it's time to send sap announcements
if (std::chrono::duration_cast<second_t> (clock_::now() - sap_timepoint).count() > if ((duration_cast<second_t>(steady_clock::now() - sap_timepoint).count())
sap_interval) { > sap_interval) {
sap_timepoint = clock_::now(); sap_timepoint = steady_clock::now();
auto sdp_len_sum = process_sap(); auto sdp_len_sum = process_sap();