Merge branch 'master' into generators

Author: Simn

src/hxcoro/dispatchers/LuvDispatcher.cpp.hx

@@ -8,7 +8,7 @@ import haxe.coro.schedulers.IScheduler;
 import haxe.ds.Option;
 import hxcoro.schedulers.LuvScheduler;
 
-class LuvDispatcher extends Dispatcher implements IShutDown
+class LuvDispatcher extends Dispatcher
 {
 	final loop:LuvLoop;
 	final workQueue:AsyncDeque<()->Void>;

src/hxcoro/run/Setup.hx

@@ -1,10 +1,9 @@
 package hxcoro.run;
 
-import haxe.coro.schedulers.IScheduler;
-import hxcoro.dispatchers.IShutDown;
 import haxe.coro.BaseContinuation;
 import haxe.coro.context.Context;
 import haxe.coro.dispatchers.Dispatcher;
+import haxe.coro.schedulers.IScheduler;
 import hxcoro.schedulers.ILoop;
 
 class Setup {
@@ -59,23 +58,32 @@ class Setup {
 
 	#if (cpp && hxcpp_luv_io)
 
-	static public function createLuvGen(createDispatcher:(cpp.luv.Luv.LuvLoop, IScheduler) -> Dispatcher) {
+	static public function createLuvGen<T:Dispatcher>(createDispatcher:(cpp.luv.Luv.LuvLoop, IScheduler) -> T, shutDownDispatcher:T -> Void) {
 		final loop = cpp.luv.Luv.allocLoop();
 		final scheduler = new hxcoro.schedulers.LuvScheduler(loop);
 		final dispatcher = createDispatcher(loop, scheduler);
 		function finalize() {
 			scheduler.shutDown();
-			if (dispatcher is IShutDown) {
-				(cast dispatcher : IShutDown).shutDown();
-			}
+			shutDownDispatcher(dispatcher);
 			cpp.luv.Luv.stopLoop(loop);
 			cpp.luv.Luv.freeLoop(loop);
 		}
 		return new LoopSetup(scheduler, dispatcher, finalize);
 	}
 
 	static public function createLuv() {
-		return createLuvGen((uvLoop, loop) -> new hxcoro.dispatchers.LuvDispatcher(uvLoop, loop));
+		return createLuvGen(
+			(uvLoop, loop) -> new hxcoro.dispatchers.LuvDispatcher(uvLoop, loop),
+			dispatcher -> dispatcher.shutDown()
+		);
+	}
+
+	static public function createLuvThreadPool() {
+		final pool = new hxcoro.thread.FixedThreadPool(10);
+		return createLuvGen(
+			(uvLoop, loop) -> new hxcoro.dispatchers.LuvDispatcher(uvLoop, loop),
+			dispatcher -> pool.shutDown()
+		);
 	}
 
 	#elseif interp
@@ -111,8 +119,10 @@ class Setup {
 	#end
 
 	static public function createDefault() {
-		#if (cpp && hxcpp_luv_io || interp)
+		#if interp
 		return createLuv();
+		#elseif (cpp && hxcpp_luv_io)
+		return createLuvThreadPool();
 		#elseif (jvm || cpp || hl)
 		return createThreadPool(10);
 		#else

tests/src/run/TestEntrypoints.hx

@@ -142,7 +142,10 @@ class TestEntrypoints extends utest.Test {
 	#if (cpp && hxcpp_luv_io)
 
 	public function testLuvTrampoline() {
-		final setup = Setup.createLuvGen((uvLoop, loop) -> new TrampolineDispatcher(loop));
+		final setup = Setup.createLuvGen(
+			(uvLoop, loop) -> new TrampolineDispatcher(loop),
+			_ -> {}
+		);
 		final context = setup.createContext();
 		runSuite(context, setup.loop);
 		setup.close();
@@ -151,11 +154,15 @@ class TestEntrypoints extends utest.Test {
 
 	public function testLuvThreadPool() {
 		final pool = new hxcoro.thread.FixedThreadPool(1);
-		final setup = Setup.createLuvGen((uvLoop, loop) -> new ThreadPoolDispatcher(loop, pool));
+		final setup = Setup.createLuvGen(
+			(uvLoop, loop) -> new ThreadPoolDispatcher(loop, pool),
+			dispatcher -> {
+				pool.shutDown();
+			}
+		);
 		final context = setup.createContext();
 		runSuite(context, setup.loop);
 		setup.close();
-		pool.shutDown();
 	}
 
 	// public function testLuvLuv() {