- workaround for HL on Haxe 3.4 which is missing native thread support

vegardit · Oct 9, 2018 · bc4d7d3 · bc4d7d3
1 parent f963b98
commit bc4d7d3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,7 @@ env:
   - HAXE_TARGET=cpp
   - HAXE_TARGET=cs
   - HAXE_TARGET=flash
+  - HAXE_TARGET=hl
   - HAXE_TARGET=lua
   - HAXE_TARGET=neko
   - HAXE_TARGET=node
@@ -30,6 +31,7 @@ matrix:
     - haxe: development
     - env: HAXE_TARGET=flash # https://github.com/travis-ci/travis-ci/issues/8481
     - env: HAXE_TARGET=cs    # C# fails because of https://github.com/HaxeFoundation/haxe/issues/6533
+    - env: HAXE_TARGET=hl
     - os: osx
   exclude:
     - haxe: development

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 - class hx.concurrent.lock.RWLock not working on JS target
+- workaround for HL on Haxe 3.4 which is missing native thread support
 
 
 ## [2.0.0] - 2018-09-20

diff --git a/src/hx/concurrent/collection/Queue.hx b/src/hx/concurrent/collection/Queue.hx
@@ -16,7 +16,7 @@ class Queue<T> {
 
     #if cpp
         var _queue = new cpp.vm.Deque<T>();
-    #elseif hl
+    #elseif (hl && haxe_ver >= 4)
         var _queue = new hl.vm.Deque<T>();
     #elseif neko
         var _queue = new neko.vm.Deque<T>();
@@ -56,7 +56,7 @@ class Queue<T> {
             throw "[timeoutMS] must be >= -1";
 
         if (timeoutMS == 0) {
-            #if (cpp||hl||neko)
+            #if (cpp||(hl && haxe_ver >= 4)||neko)
                 msg = _queue.pop(false);
             #elseif java
                 msg = _queue.poll();
@@ -69,7 +69,7 @@ class Queue<T> {
             #end
         } else {
             Threads.await(function() {
-                #if (cpp||hl||neko)
+                #if (cpp||(hl && haxe_ver >= 4)||neko)
                     msg = _queue.pop(false);
                 #elseif java
                     msg = _queue.poll();
@@ -104,7 +104,7 @@ class Queue<T> {
         if (msg == null)
             throw "[msg] must not be null";
 
-        #if (cpp||hl||neko)
+        #if (cpp||(hl && haxe_ver >= 4)||neko)
             _queue.push(msg);
         #elseif java
             _queue.addFirst(msg);
@@ -127,7 +127,7 @@ class Queue<T> {
         if (msg == null)
             throw "[msg] must not be null";
 
-        #if (cpp||hl||neko)
+        #if (cpp||(hl && haxe_ver >= 4)||neko)
             _queue.add(msg);
         #elseif java
             _queue.addLast(msg);

diff --git a/src/hx/concurrent/internal/Macros.hx b/src/hx/concurrent/internal/Macros.hx
@@ -5,6 +5,7 @@
 package hx.concurrent.internal;
 
 import haxe.macro.Compiler;
+import haxe.macro.Context;
 
 /**
  * @author Sebastian Thomschke, Vegard IT GmbH
@@ -13,8 +14,8 @@ class Macros {
 
     macro
     public static function addDefines() {
-        var def = haxe.macro.Context.getDefines();
-        if(def.exists("cpp") || def.exists("cs") || def.exists("hl") || def.exists("java") || def.exists("neko") || def.exists("python")) {
+        var def = Context.getDefines();
+        if(def.exists("cpp") || def.exists("cs") || (def.exists("hl") && Std.parseFloat(def["haxe_ver"]) >= 4) || def.exists("java") || def.exists("neko") || def.exists("python")) {
             trace("[INFO] Setting compiler define 'threads'.");
             Compiler.define("threads");
         } else {

diff --git a/src/hx/concurrent/lock/RLock.hx b/src/hx/concurrent/lock/RLock.hx
@@ -31,7 +31,7 @@ class RLock implements Acquirable {
         // flash.concurrent.Mutex requries swf-version >= 11.4
         // flash.concurrent.Condition requries swf-version >= 11.5
         var _cond = new flash.concurrent.Condition(new flash.concurrent.Mutex());
-    #elseif hl
+    #elseif (hl && haxe_ver >= 4)
         var _rlock = new hl.vm.Mutex();
     #elseif java
         var _rlock = new java.util.concurrent.locks.ReentrantLock();
@@ -115,7 +115,7 @@ class RLock implements Acquirable {
     public function acquire():Void {
         #if cs
             cs.system.threading.Monitor.Enter(this);
-        #elseif (cpp||hl||neko||python)
+        #elseif (cpp||(hl && haxe_ver >= 4)||neko||python)
             _rlock.acquire();
         #elseif java
             _rlock.lock();
@@ -157,7 +157,7 @@ class RLock implements Acquirable {
     private function tryAcquireInternal(timeoutMS = 0):Bool {
         #if cs
             return cs.system.threading.Monitor.TryEnter(this, timeoutMS);
-        #elseif (cpp||hl||neko)
+        #elseif (cpp||(hl && haxe_ver >= 4)||neko)
             return Threads.await(function() return _rlock.tryAcquire(), timeoutMS);
         #elseif java
             return _rlock.tryLock(timeoutMS, java.util.concurrent.TimeUnit.MILLISECONDS);
@@ -203,7 +203,7 @@ class RLock implements Acquirable {
 
         #if cs
             cs.system.threading.Monitor.Exit(this);
-        #elseif (cpp||hl||neko||python)
+        #elseif (cpp||(hl && haxe_ver >= 4)||neko||python)
             _rlock.release();
         #elseif java
             _rlock.unlock();

diff --git a/src/hx/concurrent/thread/Threads.hx b/src/hx/concurrent/thread/Threads.hx
@@ -28,7 +28,7 @@ class Threads {
         #elseif flash
             var worker = flash.system.Worker.current;
             return worker == null ? "MainThread" : worker;
-        #elseif hl
+        #elseif (hl && haxe_ver >= 4)
             return Std.string(hl.vm.Thread.current());
         #elseif java
             return java.vm.Thread.current();