compatibility to Julia 1.5

Author: KDr2

.github/workflows/Testing.yaml

@@ -19,6 +19,8 @@ jobs:
           - '1.2'
           - '1.3'
           - '1.4'
+          - '1.5'
+          - 'nightly'
         os:
           - ubuntu-latest
           - windows-latest

deps/build.jl

@@ -25,16 +25,16 @@ length(products_tmp) == 0 && (products_tmp = [products[end]])
 products = products_tmp
 
 # Download binaries from hosted location
-bin_prefix = "https://github.com/JuliaBinaryWrappers/Libtask_jll.jl/releases/download/Libtask-v0.3.0+0"
+bin_prefix = "https://github.com/JuliaBinaryWrappers/Libtask_jll.jl/releases/download/Libtask-v0.3.1+0"
 
 # Listing of files generated by BinaryBuilder:
 download_info = Dict(
-    Linux(:aarch64, libc=:glibc) => ("$bin_prefix/Libtask.v0.3.0.aarch64-linux-gnu.tar.gz", "e541c0df11d48b45e9334018c014ae0d012b75f92ffbc49fc4ab6eed35593731"),
-    Linux(:i686, libc=:glibc) => ("$bin_prefix/Libtask.v0.3.0.i686-linux-gnu.tar.gz", "7f68bd21609adf35878f9b16f56151ab5f6f609999a40291ed270c1a4d0331a0"),
-    Windows(:i686) => ("$bin_prefix/Libtask.v0.3.0.i686-w64-mingw32.tar.gz", "62950b53a892fb8c699ddbb4ccc9f19b12681f64fbf85a546345d5b0f23dc8d7"),
-    MacOS(:x86_64) => ("$bin_prefix/Libtask.v0.3.0.x86_64-apple-darwin14.tar.gz", "fff6523dde93e6dc12b96a8bf1e3c35a78d8dba7cdc95cd0e5dd13225d1972df"),
-    Linux(:x86_64, libc=:glibc) => ("$bin_prefix/Libtask.v0.3.0.x86_64-linux-gnu.tar.gz", "be4c590e8f13df31855be20f31c1c4ce98f499fc5173cd35c8e8b72b79e0dc5a"),
-    Windows(:x86_64) => ("$bin_prefix/Libtask.v0.3.0.x86_64-w64-mingw32.tar.gz", "267473eb211e5060b98cede7f30336d2a7453542617521f27941d353dcfe42e8"),
+    Linux(:aarch64, libc=:glibc) => ("$bin_prefix/Libtask.v0.3.1.aarch64-linux-gnu.tar.gz", "ad342e90969280fcd198993947fb27a052357c278e40645574b93f13b9f49f25"),
+    Linux(:i686, libc=:glibc) => ("$bin_prefix/Libtask.v0.3.1.i686-linux-gnu.tar.gz", "a4061a2098da96cd6c49300b2895a61ce02d822c603ba85995d300149c9cec5e"),
+    Windows(:i686) => ("$bin_prefix/Libtask.v0.3.1.i686-w64-mingw32.tar.gz", "e38da986025dac5767da841cc3666973a303061f4b853c0821fc25de4802f674"),
+    MacOS(:x86_64) => ("$bin_prefix/Libtask.v0.3.1.x86_64-apple-darwin14.tar.gz", "93bf6be03236252eea33998c5fa4f0a8173d44b20266e8e05473a2ae957eebde"),
+    Linux(:x86_64, libc=:glibc) => ("$bin_prefix/Libtask.v0.3.1.x86_64-linux-gnu.tar.gz", "349fc5fdd1d1234f1c1467fd655b9a5e18ac926e5b16db4ba7743b75a9540739"),
+    Windows(:x86_64) => ("$bin_prefix/Libtask.v0.3.1.x86_64-w64-mingw32.tar.gz", "837410807715caf15b931f04c968a3ca8967bd0d70df888d1ed535a1679030d0"),
 )
 
 # Install unsatisfied or updated dependencies:

src/taskcopy.jl

@@ -1,6 +1,8 @@
 # Utility function for self-copying mechanism
 
-n_copies() = n_copies(current_task())
+_current_task() = ccall((:vanilla_get_current_task, libtask), Ref{Task}, ())
+
+n_copies() = n_copies(_current_task())
 n_copies(t::Task) = begin
   isa(t.storage, Nothing) && (t.storage = IdDict())
   if haskey(t.storage, :n_copies)
@@ -34,14 +36,14 @@ proper way is refreshing the `current_task` (the variable `t`) in
 function task_wrapper(func)
     () ->
     try
-        ct = current_task()
+        ct = _current_task()
         res = func()
         ct.result = res
         isa(ct.storage, Nothing) && (ct.storage = IdDict())
         ct.storage[:_libtask_state] = :done
         wait()
     catch ex
-        ct = current_task()
+        ct = _current_task()
         ct.exception = ex
         ct.result = ex
         ct.backtrace = catch_backtrace()
@@ -92,7 +94,7 @@ function Base.show(io::IO, exc::CTaskException)
 end
 
 produce(v) = begin
-    ct = current_task()
+    ct = _current_task()
 
     if ct.storage == nothing
         ct.storage = IdDict()
@@ -126,7 +128,7 @@ produce(v) = begin
     if empty
         schedule(t, v)
         wait()
-        ct = current_task() # When a task is copied, ct should be updated to new task ID.
+        ct = _current_task() # When a task is copied, ct should be updated to new task ID.
         while true
             # wait until there are more consumers
             q = ct.storage[:consumers]
@@ -159,7 +161,7 @@ consume(p::Task, values...) = begin
         return wait(p)
     end
 
-    ct = current_task()
+    ct = _current_task()
     ct.result = length(values)==1 ? values[1] : values
 
     #### un-optimized version

test/tarray3.jl

@@ -7,8 +7,8 @@ using Test
     function f_ct()
         ta = tzeros(UInt64, 4);
         for i in 1:4
-            ta[i] = hash(current_task())
-            DATA[current_task()] = convert(Array, ta)
+            ta[i] = hash(Libtask._current_task())
+            DATA[Libtask._current_task()] = convert(Array, ta)
             produce(ta[i])
         end
     end