From cecfeed61e8bcb4b53c2ed8e1b26d8c8af38b8e3 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 14 Sep 2019 03:40:47 +0300 Subject: libcamera: Switch to the std::chrono API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace the clock_gettime()-based API with durations expressed as integers with the std::chrono API. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/event_dispatcher_poll.cpp | 24 +++++++++--------------- src/libcamera/include/log.h | 7 +++++-- src/libcamera/log.cpp | 20 ++++---------------- src/libcamera/timer.cpp | 33 ++++++++++++++++++++------------- 4 files changed, 38 insertions(+), 46 deletions(-) (limited to 'src/libcamera') diff --git a/src/libcamera/event_dispatcher_poll.cpp b/src/libcamera/event_dispatcher_poll.cpp index 281f37bd..51ac5adf 100644 --- a/src/libcamera/event_dispatcher_poll.cpp +++ b/src/libcamera/event_dispatcher_poll.cpp @@ -8,6 +8,7 @@ #include "event_dispatcher_poll.h" #include +#include #include #include #include @@ -20,6 +21,7 @@ #include "log.h" #include "thread.h" +#include "utils.h" /** * \file event_dispatcher_poll.h @@ -206,17 +208,12 @@ int EventDispatcherPoll::poll(std::vector *pollfds) struct timespec timeout; if (nextTimer) { - clock_gettime(CLOCK_MONOTONIC, &timeout); - uint64_t now = timeout.tv_sec * 1000000000ULL + timeout.tv_nsec; - - if (nextTimer->deadline() > now) { - uint64_t delta = nextTimer->deadline() - now; - timeout.tv_sec = delta / 1000000000ULL; - timeout.tv_nsec = delta % 1000000000ULL; - } else { - timeout.tv_sec = 0; - timeout.tv_nsec = 0; - } + utils::time_point now = utils::clock::now(); + + if (nextTimer->deadline() > now) + timeout = utils::duration_to_timespec(nextTimer->deadline() - now); + else + timeout = { 0, 0 }; LOG(Event, Debug) << "timeout " << timeout.tv_sec << "." @@ -295,10 +292,7 @@ void EventDispatcherPoll::processNotifiers(const std::vector &pol void EventDispatcherPoll::processTimers() { - struct timespec ts; - uint64_t now; - clock_gettime(CLOCK_MONOTONIC, &ts); - now = ts.tv_sec * 1000000000ULL + ts.tv_nsec; + utils::time_point now = utils::clock::now(); while (!timers_.empty()) { Timer *timer = timers_.front(); diff --git a/src/libcamera/include/log.h b/src/libcamera/include/log.h index 9b203f97..ee0b4069 100644 --- a/src/libcamera/include/log.h +++ b/src/libcamera/include/log.h @@ -7,8 +7,11 @@ #ifndef __LIBCAMERA_LOG_H__ #define __LIBCAMERA_LOG_H__ +#include #include +#include "utils.h" + namespace libcamera { enum LogSeverity { @@ -60,7 +63,7 @@ public: std::ostream &stream() { return msgStream_; } - const struct timespec ×tamp() const { return timestamp_; } + const utils::time_point ×tamp() const { return timestamp_; } LogSeverity severity() const { return severity_; } const LogCategory &category() const { return category_; } const std::string &fileInfo() const { return fileInfo_; } @@ -72,7 +75,7 @@ private: std::ostringstream msgStream_; const LogCategory &category_; LogSeverity severity_; - struct timespec timestamp_; + utils::time_point timestamp_; std::string fileInfo_; }; diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp index 91f7c3ee..51f9f86b 100644 --- a/src/libcamera/log.cpp +++ b/src/libcamera/log.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -78,17 +77,6 @@ static int log_severity_to_syslog(LogSeverity severity) } } -static std::string log_timespec_to_string(const struct timespec ×tamp) -{ - std::ostringstream ossTimestamp; - ossTimestamp.fill('0'); - ossTimestamp << "[" << timestamp.tv_sec / (60 * 60) << ":" - << std::setw(2) << (timestamp.tv_sec / 60) % 60 << ":" - << std::setw(2) << timestamp.tv_sec % 60 << "." - << std::setw(9) << timestamp.tv_nsec << "]"; - return ossTimestamp.str(); -} - static const char *log_severity_name(LogSeverity severity) { static const char *const names[] = { @@ -216,10 +204,10 @@ void LogOutput::writeSyslog(const LogMessage &msg) void LogOutput::writeStream(const LogMessage &msg) { - std::string str = std::string(log_timespec_to_string(msg.timestamp()) + - log_severity_name(msg.severity()) + " " + + std::string str = "[" + utils::time_point_to_string(msg.timestamp()) + + "]" + log_severity_name(msg.severity()) + " " + msg.category().name() + " " + msg.fileInfo() + " " + - msg.msg()); + msg.msg(); stream_->write(str.c_str(), str.size()); stream_->flush(); } @@ -777,7 +765,7 @@ LogMessage::LogMessage(LogMessage &&other) void LogMessage::init(const char *fileName, unsigned int line) { /* Log the timestamp, severity and file information. */ - clock_gettime(CLOCK_MONOTONIC, ×tamp_); + timestamp_ = utils::clock::now(); std::ostringstream ossFileInfo; ossFileInfo << utils::basename(fileName) << ":" << line; diff --git a/src/libcamera/timer.cpp b/src/libcamera/timer.cpp index c61d77e5..b3cea3da 100644 --- a/src/libcamera/timer.cpp +++ b/src/libcamera/timer.cpp @@ -7,7 +7,7 @@ #include -#include +#include #include #include @@ -15,6 +15,7 @@ #include "log.h" #include "message.h" #include "thread.h" +#include "utils.h" /** * \file timer.h @@ -42,7 +43,7 @@ LOG_DEFINE_CATEGORY(Timer) * \param[in] parent The parent Object */ Timer::Timer(Object *parent) - : Object(parent), interval_(0), deadline_(0) + : Object(parent) { } @@ -52,22 +53,28 @@ Timer::~Timer() } /** + * \fn Timer::start(unsigned int msec) * \brief Start or restart the timer with a timeout of \a msec * \param[in] msec The timer duration in milliseconds * * If the timer is already running it will be stopped and restarted. */ -void Timer::start(unsigned int msec) -{ - struct timespec tp; - clock_gettime(CLOCK_MONOTONIC, &tp); - interval_ = msec; - deadline_ = tp.tv_sec * 1000000000ULL + tp.tv_nsec + msec * 1000000ULL; +/** + * \brief Start or restart the timer with a timeout of \a interval + * \param[in] interval The timer duration in milliseconds + * + * If the timer is already running it will be stopped and restarted. + */ +void Timer::start(std::chrono::milliseconds interval) +{ + interval_ = interval; + deadline_ = utils::clock::now() + interval; LOG(Timer, Debug) << "Starting timer " << this << " with interval " - << msec << ": deadline " << deadline_; + << interval.count() << ": deadline " + << utils::time_point_to_string(deadline_); registerTimer(); } @@ -84,7 +91,7 @@ void Timer::stop() { unregisterTimer(); - deadline_ = 0; + deadline_ = utils::time_point(); } void Timer::registerTimer() @@ -103,7 +110,7 @@ void Timer::unregisterTimer() */ bool Timer::isRunning() const { - return deadline_ != 0; + return deadline_ != utils::time_point(); } /** @@ -115,7 +122,7 @@ bool Timer::isRunning() const /** * \fn Timer::deadline() * \brief Retrieve the timer deadline - * \return The timer deadline in nanoseconds + * \return The timer deadline */ /** @@ -128,7 +135,7 @@ bool Timer::isRunning() const void Timer::message(Message *msg) { if (msg->type() == Message::ThreadMoveMessage) { - if (deadline_) { + if (isRunning()) { unregisterTimer(); invokeMethod(&Timer::registerTimer); } -- cgit v1.2.1