asys

src-json/define.json

@@ -21,6 +21,11 @@
 		"define": "as3",
 		"doc": "Defined when outputting flash9 as3 source code."
 	},
+	{
+		"name": "Asys",
+		"define": "asys",
+		"doc": "Defined for all platforms that support the libuv-based asys package."
+	},
 	{
 		"name": "CheckXmlProxy",
 		"define": "check_xml_proxy",

src/context/common.ml

@@ -84,6 +84,8 @@ type platform_config = {
 	pf_static : bool;
 	(** has access to the "sys" package *)
 	pf_sys : bool;
+	(** has access to the "asys" package *)
+	pf_asys : bool;
 	(** captured variables handling (see before) *)
 	pf_capture_policy : capture_policy;
 	(** when calling a method with optional args, do we replace the missing args with "null" constants *)
@@ -312,6 +314,7 @@ let default_config =
 	{
 		pf_static = true;
 		pf_sys = true;
+		pf_asys = false;
 		pf_capture_policy = CPNone;
 		pf_pad_nulls = false;
 		pf_add_final_return = false;
@@ -421,6 +424,7 @@ let get_config com =
 		{
 			default_config with
 			pf_static = false;
+			pf_asys = true;
 			pf_pad_nulls = true;
 			pf_uses_utf16 = false;
 			pf_supports_threads = true;
@@ -588,6 +592,11 @@ let init_platform com pf =
 		define com Define.Sys
 	end else
 		com.package_rules <- PMap.add "sys" Forbidden com.package_rules;
+	if com.config.pf_asys then begin
+		raw_define_value com.defines "target.asys" "true";
+		define com Define.Asys
+	end else
+		com.package_rules <- PMap.add "asys" Forbidden com.package_rules;
 	if com.config.pf_uses_utf16 then begin
 		raw_define_value com.defines "target.utf16" "true";
 		define com Define.Utf16;

std/asys/net/Server.hx

@@ -202,5 +202,5 @@ class Server {
 	var native:NativeStream;
 	var nativeSocket:NativeSocket;
 	var nativePipe:NativePipe;
-	var listenDefer:asys.Timer;
+	var listenDefer:haxe.Timer;
 }

std/asys/net/Socket.hx

@@ -367,7 +367,7 @@ class Socket extends Duplex {
 		native.unref();
 	}
 
-	var connectDefer:asys.Timer;
+	var connectDefer:haxe.Timer;
 	var native:NativeStream;
 	var nativeSocket:NativeSocket;
 	var nativePipe:NativePipe;
@@ -376,7 +376,7 @@ class Socket extends Duplex {
 	var connectStarted = false;
 	var serverSpawn:Bool = false;
 	var timeoutTime:Int = 0;
-	var timeoutTimer:asys.Timer;
+	var timeoutTimer:haxe.Timer;
 
 	function new() {
 		super();
@@ -443,7 +443,7 @@ class Socket extends Duplex {
 			timeoutTimer.stop();
 		timeoutTimer = null;
 		if (timeoutTime != 0) {
-			timeoutTimer = asys.Timer.delay(timeoutTrigger, timeoutTime);
+			timeoutTimer = haxe.Timer.delay(timeoutTrigger, timeoutTime);
 			timeoutTimer.unref();
 		}
 	}

std/haxe/Timer.hx

@@ -22,6 +22,15 @@
 
 package haxe;
 
+#if (target.asys)
+private typedef Native =
+	#if eval
+	eval.uv.Timer;
+	#else
+	#error "Missing asys implementation"
+	#end
+#end
+
 /**
 	The `Timer` class allows you to create asynchronous timers on platforms that
 	support events.
@@ -42,6 +51,8 @@ class Timer {
 	#elseif java
 	private var timer:java.util.Timer;
 	private var task:java.util.TimerTask;
+	#elseif (target.asys)
+	private var native:Native;
 	#else
 	private var event:MainLoop.MainEvent;
 	#end
@@ -69,6 +80,8 @@ class Timer {
 		#elseif java
 		timer = new java.util.Timer();
 		timer.scheduleAtFixedRate(task = new TimerTask(this), haxe.Int64.ofInt(time_ms), haxe.Int64.ofInt(time_ms));
+		#elseif (target.asys)
+		native = new Native(time_ms, () -> run());
 		#else
 		var dt = time_ms / 1000;
 		event = MainLoop.add(function() {
@@ -103,6 +116,8 @@ class Timer {
 			timer = null;
 		}
 		task = null;
+		#elseif (target.asys)
+		native.close((err) -> {});
 		#else
 		if (event != null) {
 			event.stop();
@@ -121,12 +136,24 @@ class Timer {
 		var timer = new haxe.Timer(1000); // 1000ms delay
 		timer.run = function() { ... }
 		```
-		
+
 		Once bound, it can still be rebound to different functions until `this`
 		Timer is stopped through a call to `this.stop`.
 	**/
 	public dynamic function run() {}
 
+	public function ref() {
+		#if (target.asys)
+		native.ref();
+		#end
+	}
+
+	public function unref() {
+		#if (target.asys)
+		native.unref();
+		#end
+	}
+
 	/**
 		Invokes `f` after `time_ms` milliseconds.
 

std/haxe/async/Defer.hx

@@ -5,7 +5,7 @@ class Defer {
 		Schedules the given function to run during the next processing tick.
 		Convenience shortcut for `Timer.delay(f, 0)`.
 	**/
-	public static inline function nextTick(f:() -> Void):asys.Timer {
-		return asys.Timer.delay(f, 0);
+	public static inline function nextTick(f:() -> Void):haxe.Timer {
+		return haxe.Timer.delay(f, 0);
 	}
 }

std/haxe/io/Readable.hx

@@ -62,7 +62,7 @@ class Readable implements IReadable {
 	public var done(default, null) = false;
 
 	var buffer = new List<Bytes>();
-	var deferred:asys.Timer;
+	var deferred:haxe.Timer;
 	var willEof = false;
 
 	@:dox(show)

std/haxe/io/Writable.hx

@@ -23,7 +23,7 @@ class Writable implements IWritable {
 
 	var willDrain = false;
 	var willFinish = false;
-	var deferred:asys.Timer;
+	var deferred:haxe.Timer;
 	var buffer = new List<Bytes>();
 
 	// for use by implementing classes

tests/asys/Main.hx

@@ -3,8 +3,17 @@ import utest.ui.Report;
 
 import sys.FileSystem;
 
+#if hl
+import hl.Uv;
+#elseif eval
+import eval.Uv;
+#elseif neko
+import neko.Uv;
+#end
+
 class Main {
 	public static function main():Void {
+		Uv.init();
 		if (FileSystem.exists("resources-rw")) {
 			function walk(path:String):Void {
 				for (f in FileSystem.readDirectory(path)) {
@@ -25,5 +34,7 @@ class Main {
 		runner.onTestStart.add(test -> trace("running", Type.getClassName(Type.getClass(test.fixture.target)), test.fixture.method));
 		Report.create(runner);
 		runner.run();
+		Uv.run(RunDefault);
+		Uv.close();
 	}
 }

tests/asys/TestBase.hx

@@ -14,17 +14,11 @@ class TestBase {
 	static var helpers:Map<Process, {?exit:ProcessExit}> = [];
 
 	public static function uvSetup():Void {
-		Uv.init();
+
 	}
 
 	public static function uvTeardown():Void {
 		helperTeardown();
-		Uv.run(RunDefault);
-		Uv.close();
-	}
-
-	public static function uvRun(?mode:asys.uv.UVRunMode = asys.uv.UVRunMode.RunDefault):Bool {
-		return Uv.run(mode);
 	}
 
 	/**

tests/asys/impl/SlowSource.hx

@@ -15,7 +15,7 @@ class SlowSource extends Readable {
 		if (data.length > 0) {
 			var nextChunk = data.shift();
 			var nextEof = data.length == 0;
-			asys.Timer.delay(() -> asyncRead([nextChunk], nextEof), 10);
+			haxe.Timer.delay(() -> asyncRead([nextChunk], nextEof), 10);
 		}
 		return None;
 	}

tests/asys/test/TestAsyncFile.hx

@@ -81,7 +81,6 @@ class TestAsyncFile extends Test {
 		});
 
 		eq(asyncDone, 0);
-		TestBase.uvRun();
 	}
 
 	/**
@@ -128,6 +127,5 @@ class TestAsyncFile extends Test {
 		});
 
 		eq(asyncDone, 0);
-		TestBase.uvRun();
 	}
 }

tests/asys/test/TestAsyncFileSystem.hx

@@ -22,7 +22,6 @@ class TestAsyncFileSystem extends Test {
 		}));
 
 		eq(asyncDone, 0);
-		TestBase.uvRun();
 	}
 
 	function testStat(async:Async) {
@@ -72,7 +71,6 @@ class TestAsyncFileSystem extends Test {
 		});
 
 		eq(asyncDone, 0);
-		TestBase.uvRun();
 	}
 
 	@:timeout(3000)
@@ -97,7 +95,6 @@ class TestAsyncFileSystem extends Test {
 
 		NewFS.mkdir('$dir/foo');
 
-		TestBase.uvRun(RunOnce);
 		t(events.length == 1 && events[0].match(Rename("foo")));
 		events.resize(0);
 
@@ -108,12 +105,10 @@ class TestAsyncFileSystem extends Test {
 
 		NewFS.rmdir('$dir/foo');
 
-		TestBase.uvRun(RunOnce);
 		t(events.length == 2 && events[0].match(Rename("foo/hello.txt")));
 		t(events.length == 2 && events[1].match(Rename("foo")));
 		events.resize(0);
 
 		watcher.close();
-		TestBase.uvRun(RunOnce);
 	}
 }

tests/asys/test/TestDns.hx

@@ -10,8 +10,6 @@ class TestDns extends Test {
 			t(res[0].match(Ipv4(0x7F000001)));
 			done();
 		}));
-
-		TestBase.uvRun();
 	}
 
 	function testIpv4(async:Async) {
@@ -30,8 +28,6 @@ class TestDns extends Test {
 			t(res[0].match(Ipv4(0xFFFFFFFF)));
 			done();
 		}));
-
-		TestBase.uvRun();
 	}
 
 	function testIpv6(async:Async) {
@@ -50,7 +46,5 @@ class TestDns extends Test {
 			t(res[0].match(Ipv6(beq(_, Bytes.ofHex("4861786520697320617765736F6D6521")) => _)));
 			done();
 		}));
-
-		TestBase.uvRun();
 	}
 }

tests/asys/test/TestIpc.hx

@@ -49,8 +49,6 @@ class TestIpc extends Test {
 					});
 				});
 		});
-
-		TestBase.uvRun();
 	}
 
 	/*
@@ -72,8 +70,6 @@ class TestIpc extends Test {
 			});
 		});
 		proc.send({message: {a: [1, 2], b: "c", d: true}});
-
-		TestBase.uvRun();
 	}
 	*/
 }