diff options
| author | Max Kellermann <max@musicpd.org> | 2018-08-22 15:31:19 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-08-22 15:40:45 +0200 |
| commit | dd461400fb5c759dc32c063254cf3154f6fb5b9d (patch) | |
| tree | ec0edb3f8bbdff37642b14a456351f4e64d1c486 /src/event | |
| parent | b1390ec27fdbf35ab53a50eedf0fd63b8ea55e1b (diff) | |
system/EPollFD: rename to EpollFD
Diffstat (limited to 'src/event')
| -rw-r--r-- | src/event/PollGroup.hxx | 6 | ||||
| -rw-r--r-- | src/event/PollGroupEpoll.hxx (renamed from src/event/PollGroupEPoll.hxx) | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/event/PollGroup.hxx b/src/event/PollGroup.hxx index 764e0e737..73c752fbb 100644 --- a/src/event/PollGroup.hxx +++ b/src/event/PollGroup.hxx @@ -21,9 +21,9 @@ #define MPD_EVENT_POLLGROUP_HXX #ifdef USE_EPOLL -#include "PollGroupEPoll.hxx" -typedef PollResultEPoll PollResult; -typedef PollGroupEPoll PollGroup; +#include "PollGroupEpoll.hxx" +typedef PollResultEpoll PollResult; +typedef PollGroupEpoll PollGroup; #endif #ifdef USE_WINSELECT diff --git a/src/event/PollGroupEPoll.hxx b/src/event/PollGroupEpoll.hxx index f22ed3543..5fa1398c7 100644 --- a/src/event/PollGroupEPoll.hxx +++ b/src/event/PollGroupEpoll.hxx @@ -23,14 +23,14 @@ #include "check.h" #include "util/Compiler.h" -#include "system/EPollFD.hxx" +#include "system/EpollFD.hxx" #include <array> #include <algorithm> -class PollResultEPoll +class PollResultEpoll { - friend class PollGroupEPoll; + friend class PollGroupEpoll; std::array<epoll_event, 16> events; size_t n_events = 0; @@ -59,21 +59,21 @@ public: } }; -class PollGroupEPoll +class PollGroupEpoll { - EPollFD epoll; + EpollFD epoll; - PollGroupEPoll(PollGroupEPoll &) = delete; - PollGroupEPoll &operator=(PollGroupEPoll &) = delete; + PollGroupEpoll(PollGroupEpoll &) = delete; + PollGroupEpoll &operator=(PollGroupEpoll &) = delete; public: static constexpr unsigned READ = EPOLLIN; static constexpr unsigned WRITE = EPOLLOUT; static constexpr unsigned ERROR = EPOLLERR; static constexpr unsigned HANGUP = EPOLLHUP; - PollGroupEPoll() = default; + PollGroupEpoll() = default; - void ReadEvents(PollResultEPoll &result, int timeout_ms) noexcept { + void ReadEvents(PollResultEpoll &result, int timeout_ms) noexcept { int ret = epoll.Wait(result.events.data(), result.events.size(), timeout_ms); result.n_events = std::max(0, ret); |