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

event/SocketMonitor: add ready_flags

Browse Source 
By making each SocketMonitor keep track of its ready flags, this
removes a lot of overhead from EventLoop::RemoveFD().
This commit is contained in:
Max Kellermann
2020-10-08 20:53:43 +02:00
parent 41c0bbab13
commit 41bc17a27f
6 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/event/Loop.cxx
View File

@@ -87,20 +87,18 @@ EventLoop::Break() noexcept
}
bool
EventLoop::Abandon(int _fd, SocketMonitor &m) noexcept
EventLoop::Abandon(int _fd) noexcept
{
assert(!IsAlive() || IsInside());
poll_result.Clear(&m);
return poll_group.Abandon(_fd);
}
bool
EventLoop::RemoveFD(int _fd, SocketMonitor &m) noexcept
EventLoop::RemoveFD(int _fd) noexcept
{
assert(!IsAlive() || IsInside());
poll_result.Clear(&m);
return poll_group.Remove(_fd);
}
@@ -230,8 +228,16 @@ EventLoop::Run() noexcept
/* wait for new event */
PollResult poll_result;
poll_group.ReadEvents(poll_result, ExportTimeoutMS(timeout));
ready_sockets.clear();
for (size_t i = 0; i < poll_result.GetSize(); ++i) {
auto &sm = *(SocketMonitor *)poll_result.GetObject(i);
sm.SetReadyFlags(poll_result.GetEvents(i));
ready_sockets.push_back(sm);
}
now = std::chrono::steady_clock::now();
{
@@ -240,19 +246,12 @@ EventLoop::Run() noexcept
}
/* invoke sockets */
for (size_t i = 0; i < poll_result.GetSize(); ++i) {
auto events = poll_result.GetEvents(i);
if (events != 0) {
if (quit)
break;
while (!ready_sockets.empty() && !quit) {
auto &sm = ready_sockets.front();
ready_sockets.pop_front();
auto m = (SocketMonitor *)poll_result.GetObject(i);
m->Dispatch(events);
}
sm.Dispatch();
}
poll_result.Reset();
} while (!quit);
#ifndef NDEBUG