event/Loop: remove failing assert()

The `assert(!quit)` can fail if the `EventThread` gets stopped before it enters `EventLoop::Run()`. There is a similar problem with `alive`, which gets reset by `EventThread::Stop()`. If that happens, then `EventLoop::Run()` should return immediately without handling any events.

event/Loop: remove failing assert()
740cbe9e · Max Kellermann · ed890a27 · 740cbe9e
Commit 740cbe9e authored May 22, 2023 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

Loop.cxx src/event/Loop.cxx +3 -4

No files found.
--- a/src/event/Loop.cxx
+++ b/src/event/Loop.cxx
@@ -272,9 +272,8 @@ EventLoop::Run() noexcept
 #endif

 	assert(IsInside());
-	assert(!quit);
 #ifdef HAVE_THREADED_EVENT_LOOP
-	assert(alive);
+	assert(alive || quit);
 	assert(busy);

 	wake_event.Schedule(SocketEvent::READ);
@@ -299,7 +298,7 @@ EventLoop::Run() noexcept

 	steady_clock_cache.flush();

-	do {
+	while (!quit) {
 		again = false;

 		/* invoke timers */
@@ -361,7 +360,7 @@ EventLoop::Run() noexcept

 			socket_event.Dispatch();
 		}
-	} while (!quit);
+	}

 #ifdef HAVE_THREADED_EVENT_LOOP
 #ifndef NDEBUG