4 files changed, 59 insertions, 4 deletions

diff --git a/unit_tests/scripts/linda/multiple_keepers.lua b/unit_tests/scripts/linda/multiple_keepers.lua
index 8733087..267d874 100644
--- a/unit_tests/scripts/linda/multiple_keepers.lua
+++ b/unit_tests/scripts/linda/multiple_keepers.lua
@@ -2,9 +2,9 @@
 local require_lanes_result_1, require_lanes_result_2 = require "lanes".configure{nb_user_keepers = 3, keepers_gc_threshold = 500}
 local lanes = require_lanes_result_1
 
-local a = lanes.linda("A", 1)
-local b = lanes.linda("B", 2)
-local c = lanes.linda("C", 3)
+local a = lanes.linda{name = "A", group = 1}
+local b = lanes.linda{name = "B", group = 2}
+local c = lanes.linda{name = "C", group = 3}
 
 -- store each linda in the other 2
 do
diff --git a/unit_tests/scripts/linda/send_receive_func_and_string.lua b/unit_tests/scripts/linda/send_receive_func_and_string.lua
new file mode 100644
index 0000000..188cfcd
--- /dev/null
+++ b/unit_tests/scripts/linda/send_receive_func_and_string.lua
@@ -0,0 +1,13 @@
+local lanes = require "lanes"
+
+-- a newly created linda doesn't contain anything
+local l = lanes.linda()
+
+-- send a function and a string, make sure that's what we read back
+l:send("k", function() end, "str")
+local c = l:count("k")
+assert(c == 2, "got " .. c)
+local k, v1, v2 = l:receive_batched("k", 2)
+local tv1, tv2 = type(v1), type(v2)
+assert(k == "k" and tv1 == "function" and tv2 == "string", "got " .. tv1 .. " " .. tv2)
+assert(l:count("k") == 0)
diff --git a/unit_tests/scripts/linda/send_registered_userdata.lua b/unit_tests/scripts/linda/send_registered_userdata.lua
index 2c0195a..90c05c9 100644
--- a/unit_tests/scripts/linda/send_registered_userdata.lua
+++ b/unit_tests/scripts/linda/send_registered_userdata.lua
@@ -1,5 +1,5 @@
 local lanes = require 'lanes'.configure{with_timers = false}
-local l = lanes.linda'gleh'
+local l = lanes.linda{name = 'gleh'}
 l:set('yo', io.stdin)
 local n, stdin_out = l:get('yo')
 assert(n == 1 and stdin_out == io.stdin, tostring(stdin_out) .. " ~= " .. tostring(io.stdin))
diff --git a/unit_tests/scripts/linda/wake_period.lua b/unit_tests/scripts/linda/wake_period.lua
new file mode 100644
index 0000000..d2dccc3
--- /dev/null
+++ b/unit_tests/scripts/linda/wake_period.lua
@@ -0,0 +1,42 @@
+-- default wake period is 0.5 seconds
+local require_lanes_result_1, require_lanes_result_2 = require "lanes".configure{linda_wake_period = 0.5}
+local lanes = require_lanes_result_1
+
+-- a lane that performs a blocking operation for 2 seconds
+local body = function(linda_)
+        -- a blocking read that lasts longer than the tested wake_period values
+        linda_:receive(2, "empty_slot")
+        return "done"
+end
+
+-- if we don't cancel the lane, we should wait the whole duration
+local function check_wake_duration(linda_, expected_, do_cancel_)
+        local h = lanes.gen(body)(linda_)
+        -- wait until the linda is blocked
+        repeat until h.status == "waiting"
+        local t0 = lanes.now_secs()
+        -- soft cancel, no timeout, no waking
+        if do_cancel_ then
+                local result, reason = h:cancel('soft', 0, false)
+                -- should say there was a timeout, since the lane didn't actually cancel (normal since we did not wake it)
+                assert(result == false and reason == 'timeout', "unexpected cancel result")
+        end
+        -- this should wait until the linda wakes by itself before the actual receive timeout and sees the cancel request
+        local r, ret = h:join()
+        assert(r == true and ret == "done")
+        local t1 = lanes.now_secs()
+        local delta = t1 - t0
+        -- the linda should check for cancellation at about the expected period, not earlier
+        assert(delta >= expected_, tostring(linda_) .. " woke too early:" .. delta)
+        -- the lane shouldn't terminate too long after cancellation was processed
+        assert(delta <= expected_ * 1.1, tostring(linda_) .. " woke too late: " .. delta)
+end
+
+-- legacy behavior: linda waits until operation timeout
+check_wake_duration(lanes.linda{name = "A", wake_period = 'never'}, 2, true)
+-- early wake behavior: linda wakes after the expected time, sees a cancellation requests, and aborts the operation early
+check_wake_duration(lanes.linda{name = "B", wake_period = 0.25}, 0.25, true)
+check_wake_duration(lanes.linda{name = "C"}, 0.5, true) -- wake_period defaults to 0.5 (see above)
+check_wake_duration(lanes.linda{name = "D", wake_period = 1}, 1, true)
+-- even when there is a wake_period, the operation should reach full timeout if not cancelled early
+check_wake_duration(lanes.linda{name = "E", wake_period = 0.1}, 2, false)