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

event/SocketMonitor: refactor to SocketEvent

Browse Source 
Similar to commits 1686f4e857 and
30a5dd267b
This commit is contained in:
Max Kellermann
2020-10-14 14:24:16 +02:00
parent 4d68a12f03
commit 5a4055fb08
26 changed files with 282 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/zeroconf/AvahiPoll.cxx
View File

@@ -18,28 +18,29 @@
*/
#include "AvahiPoll.hxx"
#include "event/SocketMonitor.hxx"
#include "event/SocketEvent.hxx"
#include "event/TimerEvent.hxx"
#include "time/Convert.hxx"
static unsigned
FromAvahiWatchEvent(AvahiWatchEvent e)
{
return (e & AVAHI_WATCH_IN ? SocketMonitor::READ : 0) |
(e & AVAHI_WATCH_OUT ? SocketMonitor::WRITE : 0);
return (e & AVAHI_WATCH_IN ? SocketEvent::READ : 0) |
(e & AVAHI_WATCH_OUT ? SocketEvent::WRITE : 0);
}
static AvahiWatchEvent
ToAvahiWatchEvent(unsigned e)
{
return AvahiWatchEvent((e & SocketMonitor::READ ? AVAHI_WATCH_IN : 0) |
(e & SocketMonitor::WRITE ? AVAHI_WATCH_OUT : 0) |
(e & SocketMonitor::ERROR ? AVAHI_WATCH_ERR : 0) |
(e & SocketMonitor::HANGUP ? AVAHI_WATCH_HUP : 0));
return AvahiWatchEvent((e & SocketEvent::READ ? AVAHI_WATCH_IN : 0) |
(e & SocketEvent::WRITE ? AVAHI_WATCH_OUT : 0) |
(e & SocketEvent::ERROR ? AVAHI_WATCH_ERR : 0) |
(e & SocketEvent::HANGUP ? AVAHI_WATCH_HUP : 0));
}
struct AvahiWatch final : private SocketMonitor {
private:
struct AvahiWatch final {
SocketEvent event;
const AvahiWatchCallback callback;
void *const userdata;
@@ -49,14 +50,14 @@ public:
AvahiWatch(SocketDescriptor _fd, AvahiWatchEvent _event,
AvahiWatchCallback _callback, void *_userdata,
EventLoop &_loop)
:SocketMonitor(_fd, _loop),
:event(_loop, BIND_THIS_METHOD(OnSocketReady), _fd),
callback(_callback), userdata(_userdata),
received(AvahiWatchEvent(0)) {
Schedule(FromAvahiWatchEvent(_event));
event.Schedule(FromAvahiWatchEvent(_event));
}
static void WatchUpdate(AvahiWatch *w, AvahiWatchEvent event) {
w->Schedule(FromAvahiWatchEvent(event));
w->event.Schedule(FromAvahiWatchEvent(event));
}
static AvahiWatchEvent WatchGetEvents(AvahiWatch *w) {
@@ -68,12 +69,10 @@ public:
}
private:
/* virtual methods from class SocketMonitor */
bool OnSocketReady(unsigned flags) noexcept override {
void OnSocketReady(unsigned flags) noexcept {
received = ToAvahiWatchEvent(flags);
callback(this, GetSocket().Get(), received, userdata);
callback(this, event.GetSocket().Get(), received, userdata);
received = AvahiWatchEvent(0);
return true;
}
};

19
src/zeroconf/ZeroconfBonjour.cxx
View File

@@ -20,7 +20,7 @@
#include "ZeroconfBonjour.hxx"
#include "ZeroconfInternal.hxx"
#include "Listen.hxx"
#include "event/SocketMonitor.hxx"
#include "event/SocketEvent.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
#include "util/Compiler.h"
@@ -31,15 +31,19 @@
static constexpr Domain bonjour_domain("bonjour");
class BonjourMonitor final : public SocketMonitor {
class BonjourMonitor final {
DNSServiceRef service_ref;
SocketEvent socket_event;
public:
BonjourMonitor(EventLoop &_loop, DNSServiceRef _service_ref)
:SocketMonitor(SocketDescriptor(DNSServiceRefSockFD(_service_ref)),
_loop),
service_ref(_service_ref) {
ScheduleRead();
:service_ref(_service_ref),
socket_event(SocketDescriptor(DNSServiceRefSockFD(service_ref)),
BIND_THIS_METHOD(OnSocketReady),
_loop)
{
socket_event.ScheduleRead();
}
~BonjourMonitor() {
@@ -48,9 +52,8 @@ public:
protected:
/* virtual methods from class SocketMonitor */
bool OnSocketReady([[maybe_unused]] unsigned flags) noexcept override {
void OnSocketReady([[maybe_unused]] unsigned flags) noexcept override {
DNSServiceProcessResult(service_ref);
return true;
}
};