Merge pull request #28 from TuringLang/copy-task

Enable stack copying for Julia v1.1 and later

Author: yebai

.travis.yml

@@ -54,4 +54,4 @@ jobs:
     script:
     - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
     - julia -e 'using Pkg; Pkg.clone(pwd(), "Libtask"); Pkg.build("Libtask"); Pkg.test("Libtask"; coverage=true)'
-    - julia -e 'using Pkg; cd(Pkg.dir("Libtask")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())'
+    # - julia -e 'using Pkg; cd(Pkg.dir("Libtask")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())'

README.md

@@ -20,7 +20,8 @@ function f_ct()
   end
 end
 
-t = Task(f_ct)
+t = CTask(f_ct)
+# or t = Task(f_ct) |> enable_stack_copying
 
 consume(t) == 0
 consume(t) == 1
@@ -40,7 +41,9 @@ function f_ct2()
   end
 end
 
-t = Task(f_ct2)
+t = CTask(f_ct2)
+# or t = Task(f_ct2) |> enable_stack_copying
+
 
 consume(t) == 0
 consume(t) == 1
@@ -63,7 +66,7 @@ function f_cta()
   end
 end
 
-t = Task(f_cta)
+t = Task(f_cta) |> enable_stack_copying
 
 consume(t) == 0
 consume(t) == 1

VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

deps/Makefile

@@ -1,7 +1,7 @@
 JULIA_HOME ?= $(PWD)
 target ?= x86_64-linux-gnu
 prefix ?= $(PWD)
-JULIA_VERSION ?= v1_0
+JULIA_VERSION ?= v1_1
 
 INCLUDES = -I$(JULIA_HOME)/include/julia
 

deps/task.c

@@ -5,6 +5,19 @@
 
 #include "julia.h"
 
+jl_task_t *jl_enable_stack_copying(jl_task_t *t)
+{
+#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 1
+    if (!t->copy_stack) {
+        jl_ptls_t ptls = jl_get_ptls_states();
+        t->copy_stack = 1;
+        t->bufsz = 0;
+        memcpy(&t->ctx, &ptls->base_ctx, sizeof(t->ctx));
+    }
+#endif
+    return t;
+}
+
 jl_task_t *jl_clone_task(jl_task_t *t)
 {
     jl_ptls_t ptls = jl_get_ptls_states();
@@ -40,7 +53,7 @@ jl_task_t *jl_clone_task(jl_task_t *t)
     memcpy((void*)newt->ctx, (void*)t->ctx, sizeof(jl_jmp_buf));
 #endif
 
-    if (t->stkbuf){
+    if (t->stkbuf) {
 #if !(JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 1)
         newt->ssize = t->ssize;  // size of saved piece
 #endif
@@ -51,7 +64,7 @@ jl_task_t *jl_clone_task(jl_task_t *t)
         t->bufsz    = 0;
         newt->bufsz = 0;
         newt->stkbuf = t->stkbuf;
-    }else{
+    } else {
 #if !(JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 1)
         newt->ssize = 0;
 #endif

src/Libtask.jl

@@ -1,6 +1,6 @@
 module Libtask
 
-export consume, produce, TArray, get, tzeros, tfill, TRef
+export enable_stack_copying, CTask, consume, produce, TArray, get, tzeros, tfill, TRef
 
 include("../deps/deps.jl"); check_deps();
 include("taskcopy.jl")

src/taskcopy.jl

@@ -16,6 +16,13 @@ n_copies(t::Task) = begin
   end
 end
 
+function enable_stack_copying(t::Task)
+    t.state != :runnable && t.state != :done &&
+        error("Only runnable or finished tasks' stack can be copied.")
+    return ccall((:jl_enable_stack_copying, libtask), Any, (Any,), t)::Task
+end
+
+CTask(func) = Task(func) |> enable_stack_copying
 
 function Base.copy(t::Task)
   t.state != :runnable && t.state != :done &&

test/clonetask.jl

@@ -12,13 +12,15 @@ function f_ct()
   end
 end
 
-t = Task(f_ct)
+t = Task(f_ct) |> enable_stack_copying
 
 @test consume(t) == 0
 @test consume(t) == 1
 a = copy(t);
 @test consume(a) == 2
 @test consume(a) == 3
+@test consume(t) == 2
+@test consume(t) == 3
 
 # Test case 2: heap allocated objects are shallowly copied.
 
@@ -30,7 +32,7 @@ function f_ct2()
   end
 end
 
-t = Task(f_ct2)
+t = CTask(f_ct2)
 
 @test consume(t) == 0
 @test consume(t) == 1

test/tarray.jl

@@ -13,7 +13,7 @@ function f_cta()
   end
 end
 
-t = Task(f_cta)
+t = Task(f_cta) |> enable_stack_copying
 
 consume(t); consume(t)
 a = copy(t);

test/tref.jl

@@ -12,7 +12,7 @@ function f_cta()
   end
 end
 
-t = Task(f_cta)
+t = Task(f_cta) |> enable_stack_copying
 
 consume(t); consume(t)
 a = copy(t);
@@ -32,7 +32,7 @@ function dict_test()
   end
 end
 
-t = Task(dict_test)
+t = Task(dict_test) |> enable_stack_copying
 
 consume(t); consume(t)
 a = copy(t);