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

event/SocketMonitor: un-inline Schedule()

Browse Source 
Merge with CommitEventFlags().
This commit is contained in:
Max Kellermann 2013-08-07 23:57:30 +02:00
parent 0287ac794e
commit b63db1c1aa
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/event/SocketMonitor.cxx
View File

@ -135,6 +135,20 @@ SocketMonitor::Close()
close_socket(Steal());
}
void
SocketMonitor::Schedule(unsigned flags)
{
assert(IsDefined());
if (flags == GetScheduledFlags())
return;
poll.events = flags;
poll.revents &= flags;
loop.WakeUp();
}
SocketMonitor::ssize_t
SocketMonitor::Read(void *data, size_t length)
{
@ -163,11 +177,3 @@ SocketMonitor::Write(const void *data, size_t length)
return send(Get(), (const char *)data, length, flags);
}
void
SocketMonitor::CommitEventFlags()
{
assert(IsDefined());
loop.WakeUp();
}

25
src/event/SocketMonitor.hxx
View File

@ -86,37 +86,32 @@ public:
void Close();
void Schedule(unsigned flags) {
unsigned GetScheduledFlags() const {
assert(IsDefined());
poll.events = flags;
poll.revents &= flags;
CommitEventFlags();
return poll.events;
}
void Schedule(unsigned flags);
void Cancel() {
poll.events = 0;
CommitEventFlags();
Schedule(0);
}
void ScheduleRead() {
poll.events |= READ|HANGUP|ERROR;
CommitEventFlags();
Schedule(GetScheduledFlags() | READ | HANGUP | ERROR);
}
void ScheduleWrite() {
poll.events |= WRITE;
CommitEventFlags();
Schedule(GetScheduledFlags() | WRITE);
}
void CancelRead() {
poll.events &= ~(READ|HANGUP|ERROR);
CommitEventFlags();
Schedule(GetScheduledFlags() & ~(READ|HANGUP|ERROR));
}
void CancelWrite() {
poll.events &= ~WRITE;
CommitEventFlags();
Schedule(GetScheduledFlags() & ~WRITE);
}
ssize_t Read(void *data, size_t length);
@ -136,8 +131,6 @@ public:
gpointer user_data);
private:
void CommitEventFlags();
bool Check() const {
assert(IsDefined());