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

event/MultiSocketMonitor: migrate from TimeoutMonitor to TimerEvent

Browse Source
This commit is contained in:
Max Kellermann
2017-08-29 16:23:22 +02:00
parent 11f36c0bd6
commit 7ae57a3531
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/event/MultiSocketMonitor.cxx
View File

@@ -28,7 +28,8 @@
#endif
MultiSocketMonitor::MultiSocketMonitor(EventLoop &_loop)
:IdleMonitor(_loop), TimeoutMonitor(_loop) {
:IdleMonitor(_loop),
timeout_event(_loop, BIND_THIS_METHOD(OnTimeout)) {
}
void
@@ -38,7 +39,7 @@ MultiSocketMonitor::Reset()
fds.clear();
IdleMonitor::Cancel();
TimeoutMonitor::Cancel();
timeout_event.Cancel();
ready = refresh = false;
}
@@ -81,9 +82,9 @@ MultiSocketMonitor::Prepare()
{
const auto timeout = PrepareSockets();
if (timeout >= timeout.zero())
TimeoutMonitor::Schedule(timeout);
timeout_event.Schedule(timeout);
else
TimeoutMonitor::Cancel();
timeout_event.Cancel();
}