Skip to content

M
mpd
Commit 935e6229 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

event/Loop: allow calling AddFD()... before starting the EventThread

Relax the assertions. This is necessary if BlockingCall() is used before the thread is started.
parent 1efbbfcd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/event/Loop.cxx
View file @ 935e6229
......@@ -55,7 +55,7 @@ EventLoop::Break() noexcept
bool
EventLoop::Abandon(int _fd, SocketMonitor &m) noexcept
{
assert(IsInside());
assert(!IsAlive() || IsInside());
poll_result.Clear(&m);
return poll_group.Abandon(_fd);
......@@ -64,7 +64,7 @@ EventLoop::Abandon(int _fd, SocketMonitor &m) noexcept
bool
EventLoop::RemoveFD(int _fd, SocketMonitor &m) noexcept
{
assert(IsInside());
assert(!IsAlive() || IsInside());
poll_result.Clear(&m);
return poll_group.Remove(_fd);
......
src/event/Loop.hxx
View file @ 935e6229
......@@ -143,13 +143,13 @@ public:
void Break() noexcept;
bool AddFD(int _fd, unsigned flags, SocketMonitor &m) noexcept {
assert(IsInside());
assert(!IsAlive() || IsInside());
return poll_group.Add(_fd, flags, &m);
}
bool ModifyFD(int _fd, unsigned flags, SocketMonitor &m) noexcept {
assert(IsInside());
assert(!IsAlive() || IsInside());
return poll_group.Modify(_fd, flags, &m);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment