oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

zeroconf/AvahiPoll: move TimevalToChrono() to time/Convert.cxx

Browse Source
This commit is contained in:
Max Kellermann
2019-05-08 16:11:14 +02:00
parent 8beac03dc4
commit af3ea97a42
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/zeroconf/AvahiPoll.cxx
View File

@@ -20,6 +20,7 @@
#include "AvahiPoll.hxx"
#include "event/SocketMonitor.hxx"
#include "event/TimerEvent.hxx"
#include "time/Convert.hxx"
static unsigned
FromAvahiWatchEvent(AvahiWatchEvent e)
@@ -78,12 +79,6 @@ private:
}
};
static constexpr std::chrono::steady_clock::duration
TimevalToChrono(const timeval &tv)
{
return std::chrono::seconds(tv.tv_sec) + std::chrono::microseconds(tv.tv_usec);
}
struct AvahiTimeout final {
TimerEvent timer;
@@ -97,12 +92,12 @@ public:
:timer(_loop, BIND_THIS_METHOD(OnTimeout)),
callback(_callback), userdata(_userdata) {
if (tv != nullptr)
timer.Schedule(TimevalToChrono(*tv));
timer.Schedule(ToSteadyClockDuration(*tv));
}
static void TimeoutUpdate(AvahiTimeout *t, const struct timeval *tv) {
if (tv != nullptr)
t->timer.Schedule(TimevalToChrono(*tv));
t->timer.Schedule(ToSteadyClockDuration(*tv));
else
t->timer.Cancel();
}