Fixes 20130413

bin/vibe

@@ -32,7 +32,7 @@ cp -p "$VIBEPATH"/vpm.d /tmp/vpm.d
 chmod 666 /tmp/vpm.d
 
 # run VPM and delete the vpm.d file again, VPM will output the compile/run script
-rdmd -g -w -property -version=VibeLibeventDriver -I"$VIBEPATH"/../source $LIBS -Jviews -Isource /tmp/vpm.d "$VIBEPATH" "$START_SCRIPT" $1 $2 $3 $4 $5 $6 $7 $8 $9
+rdmd -g -w -property -version=VibeLibeventDriver -I"$VIBEPATH"/../source -I"$VIBEPATH"/../import $LIBS -Jviews -Isource /tmp/vpm.d "$VIBEPATH" "$START_SCRIPT" $1 $2 $3 $4 $5 $6 $7 $8 $9
 rm /tmp/vpm.d
 
 # compile/run the application

bin/vibe.cmd

@@ -16,7 +16,7 @@ copy "%VIBE_BIN%vpm.d" %EXEDIR% > nul 2>&1
 del %START_SCRIPT% >nul 2>&1
 
 rem Run, execute, do everything.. but when you do it, do it with the vibe!
-rdmd -debug -g -w -property -version=VibeLibeventDriver -of%EXEDIR%\vpm.exe -I%VIBE_BIN%..\source %LIBS% %EXEDIR%\vpm.d %VIBE_BIN% %START_SCRIPT% %*
+rdmd -debug -g -w -property -version=VibeLibeventDriver -of%EXEDIR%\vpm.exe -I%VIBE_BIN%..\source -I%VIBE_BIN%..\import %LIBS% %EXEDIR%\vpm.d %VIBE_BIN% %START_SCRIPT% %*
 
 rem Finally, start the app, if vpm succeded.
 if %ERRORLEVEL% == 0 (

bin/vpm.d

@@ -131,6 +131,7 @@ int main(string[] args)
 				}
 				flags ~= "-g";
 				flags ~= "-I" ~ (vibedDir ~ ".." ~ "source").toNativeString();
+				flags ~= "-I" ~ (vibedDir ~ ".." ~ "import").toNativeString();
 				flags ~= "-Isource";
 				flags ~= "-Jviews";
 				flags ~= vpm.dflags;

source/vibe/appmain.d

@@ -46,16 +46,19 @@ int main()
 
 		lowerPrivileges();
 
-		logInfo("Running event loop...");
+		logDiagnostic("Running event loop...");
+		int status;
 		debug {
-			return runEventLoop();
+			status = runEventLoop();
 		} else {
 			try {
-				return runEventLoop();
+				status = runEventLoop();
 			} catch( Throwable th ){
 				logError("Unhandled exception in event loop: %s", th.toString());
 				return 1;
 			}
 		}
+		logDiagnostic("Event loop exited with status %d.", status);
+		return status;
 	}
 }

source/vibe/core/core.d

@@ -708,6 +708,7 @@ private void setupDriver()
 	else version(VibeLibevDriver) setEventDriver(new LibevDriver(s_core));
 	else version(VibeLibeventDriver) setEventDriver(new Libevent2Driver(s_core));
 	else static assert(false, "No event driver is available. Please specify a -version=Vibe*Driver for the desired driver.");
+	logTrace("driver %s created", (cast(Object)getEventDriver()).classinfo.name);
 }
 
 private void workerThreadFunc()

source/vibe/core/drivers/win32.d

@@ -79,7 +79,7 @@ class Win32EventDriver : EventDriver {
 	int runEventLoop()
 	{
 		m_exit = false;
-		while( !m_exit )
+		while( !m_exit && haveEvents() )
 			runEventLoopOnce();
 		return 0;
 	}
@@ -111,6 +111,8 @@ class Win32EventDriver : EventDriver {
 		return 0;
 	}
 
+	private bool haveEvents() { return !m_fileWriters.byKey.empty || !m_socketHandlers.byKey.empty; }
+
 	private void waitForEvents(uint timeout)
 	{
 		auto ret = MsgWaitForMultipleObjectsEx(cast(DWORD)m_registeredEvents.length, m_registeredEvents.ptr, timeout, QS_ALLEVENTS, MWMO_ALERTABLE|MWMO_INPUTAVAILABLE);

tests/args/source/app.d

@@ -8,11 +8,11 @@ import std.stdio;
 shared static this()
 {
 	string argtest;
-	getOption("argtest", &argtest);
+	getOption("argtest", &argtest, "Test argument");
 	writeln("argtest=", argtest);
 }
 
 void main()
 {
-	finalizeCommandLineArgs();
+	finalizeCommandLineOptions();
 }

tests/args/test.sh

@@ -11,6 +11,6 @@ fi
 
 ( $VIBE | grep -q '^argtest=$' ) || die "Fail (no argument)"
 ( $VIBE -- --argtest=aoeu | grep -q '^argtest=aoeu$' ) || die "Fail (with argument)"
-( ( ! $VIBE -- --inexisting ) | grep -qF 'Unrecognized command-line parameter' ) || die "Fail (unknown argument)"
+( ( ! $VIBE -- --inexisting 2>&1 ) | grep -qF 'Unrecognized command line option' ) || die "Fail (unknown argument)"
 
 echo 'OK'