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

Relax the assertions. This is necessary if BlockingCall() is used before the thread is started.

event/Loop: allow calling AddFD()... before starting the EventThread
935e6229 · Max Kellermann · 1efbbfcd · 935e6229 · 935e6229
Commit 935e6229 authored May 05, 2020 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Loop.cxx src/event/Loop.cxx +2 -2

Loop.hxx src/event/Loop.hxx +2 -2

No files found.
--- a/src/event/Loop.cxx
+++ b/src/event/Loop.cxx
@@ -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);

--- a/src/event/Loop.hxx
+++ b/src/event/Loop.hxx
@@ -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);
 	}