Added EventDriver.runEventLoopOnce() and fixed yieldForEvent() outsid…

…e of a fiber to use it and block if necessary.
nootek · Jul 15, 2012 · 9bcbae8 · 9bcbae8
1 parent d12e862
commit 9bcbae8
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 3 deletions.
diff --git a/source/vibe/core/core.d b/source/vibe/core/core.d
@@ -270,7 +270,7 @@ private class VibeDriverCore : DriverCore {
 			}
 		} else {
 			assert(!s_eventLoopRunning, "Event processing outside of a fiber should only happen before the event loop is running!?");
-			if( auto err = s_driver.processEvents() != 0){
+			if( auto err = s_driver.runEventLoopOnce() ){
 				if( err == 1 ){
 					logDebug("No events registered, exiting event loop.");
 					throw new Exception("No events registered in vibeYieldForEvent.");

diff --git a/source/vibe/core/driver.d b/source/vibe/core/driver.d
@@ -25,8 +25,11 @@ interface EventDriver {
 	*/
 	int runEventLoop();
 
-	/** Processes all outstanding events, potentially blocking until the first event comes
-		available.
+	/* Processes all outstanding events, potentially blocking to wait for the first event.
+	*/
+	int runEventLoopOnce();
+
+	/** Processes all outstanding events if any, does not block.
 	*/
 	int processEvents();
 

diff --git a/source/vibe/core/drivers/libev.d b/source/vibe/core/drivers/libev.d
@@ -72,6 +72,13 @@ class LibevDriver : EventDriver {
 		return 0;
 	}
 
+	int runEventLoopOnce()
+	{
+		ev_run(m_loop, EVRUN_ONCE);
+		m_core.notifyIdle();
+		return 0;
+	}
+
 	int processEvents()
 	{
 		ev_run(m_loop, EVRUN_NOWAIT);

diff --git a/source/vibe/core/drivers/libevent2.d b/source/vibe/core/drivers/libevent2.d
@@ -179,6 +179,13 @@ class Libevent2Driver : EventDriver {
 		return ret;
 	}
 
+	int runEventLoopOnce()
+	{
+		auto ret = event_base_loop(m_eventLoop, EVLOOP_ONCE);
+		m_core.notifyIdle();
+		return ret;
+	}
+
 	int processEvents()
 	{
 		auto ret = event_base_loop(m_eventLoop, EVLOOP_NONBLOCK);

diff --git a/source/vibe/core/drivers/win32.d b/source/vibe/core/drivers/win32.d
@@ -131,6 +131,11 @@ class Win32EventDriver : EventDriver {
 	int processEvents()
 	{
 		waitForEvents(0);
+		return processEvents();
+	}
+
+	int processEvents()
+	{
 		MSG msg;
 		while( PeekMessageW(&msg, null, 0, 0, PM_REMOVE) ){
 			if( msg.message == WM_QUIT ) return 0;

diff --git a/source/vibe/core/drivers/winrt.d b/source/vibe/core/drivers/winrt.d
@@ -32,6 +32,11 @@ class WinRtEventDriver : EventDriver {
 		return 0;
 	}
 
+	int runEventLoopOnce()
+	{
+		return 0;
+	}
+
 	int processEvents()
 	{
 		return 0;