event/Loop: fix assertion failure due to wrong "busy" value

If an InjectEvent callback schedules a timer, the loop will restart, but the "busy" flag is still false. The fix is to move the "again" check before the "busy" setting.

event/Loop: fix assertion failure due to wrong "busy" value
906e82f6 · Max Kellermann · bcb7e954 · 906e82f6
Commit 906e82f6 authored Jan 12, 2021 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

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

No files found.
--- a/src/event/Loop.cxx
+++ b/src/event/Loop.cxx
@@ -326,15 +326,19 @@ EventLoop::Run() noexcept
 		{
 			const std::lock_guard<Mutex> lock(mutex);
 			HandleInject();
-			busy = false;
-		}
 #endif

 			if (again)
-			/* re-evaluate timers because one of the
-			   DeferEvents may have added a new timeout */
+				/* re-evaluate timers because one of
+				   the DeferEvents may have added a
+				   new timeout */
 				continue;

+#ifdef HAVE_THREADED_EVENT_LOOP
+			busy = false;
+		}
+#endif
+
 		/* wait for new event */

 		Wait(timeout);