event/Loop: make IsInsideOrNull() available in the NDEBUG build

Fixes build breakage by commit 4e5271fc; and this method does make sense in non-debug builds.

event/Loop: make IsInsideOrNull() available in the NDEBUG build
7372c931 · Max Kellermann · 29e1b6e4 · 7372c931 · 7372c931
Commit 7372c931 authored Feb 09, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

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

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

No files found.
--- a/src/event/Loop.cxx
+++ b/src/event/Loop.cxx
@@ -222,8 +222,9 @@ EventLoop::Run()
 #ifndef NDEBUG
 	assert(busy);
 	assert(thread.IsInside());
-	thread = ThreadId::Null();
 #endif
+
+	thread = ThreadId::Null();
 }

 void

--- a/src/event/Loop.hxx
+++ b/src/event/Loop.hxx
@@ -212,12 +212,16 @@ public:
 	}
 #endif

-#ifndef NDEBUG
+	/**
+	 * Like IsInside(), but also returns true if the thread has
+	 * already ended (or was not started yet).  This is useful for
+	 * code which may run during startup or shutdown, when events
+	 * are not yet/anymore handled.
+	 */
 	gcc_pure
 	bool IsInsideOrNull() const {
 		return thread.IsNull() || thread.IsInside();
 	}
-#endif
 };

 #endif /* MAIN_NOTIFY_H */