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

system/EPollFD: rename to EpollFD

Browse Source
This commit is contained in:
Max Kellermann
2018-08-22 15:31:19 +02:00
parent b1390ec27f
commit dd461400fb
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event/PollGroup.hxx
+3 -3
View File
@@ -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
src/event/PollGroupEPoll.hxx → src/event/PollGroupEpoll.hxx
+9 -9
View File
@@ -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);