1 files changed, 11 insertions, 10 deletions

diff --git a/tests/linda_perf.lua b/tests/linda_perf.lua
index bba1408..e68d552 100644
--- a/tests/linda_perf.lua
+++ b/tests/linda_perf.lua
@@ -22,7 +22,7 @@ if true then
         do
                 print "############################################ tests get/set"
                 -- linda:get throughput
-                local l = lanes.linda("get/set", 1)
+                local l = lanes.linda{name = "get/set", group = 1}
                 local batch = {}
                 for i = 1,1000 do
                         table.insert(batch, i)
@@ -56,7 +56,7 @@ local eater = function( l, loop)
         -- print "loop is over"
         key, val = l:receive( "done")
         print("eater: done ("..val..")")
-        return true
+        return "ate everything"
 end
 
 -- #################################################################################################
@@ -68,13 +68,13 @@ local gobbler = function( l, loop, batch)
         l:receive( "go")
         -- eat data in batches
         for i = 1, loop/batch do
-                l:receive( l.batched, "key", batch)
+                l:receive_batched("key", batch)
                 -- print("gobbler:", batch)
         end
         print "loop is over"
         key, val = l:receive( "done")
         print("gobbler: done ("..val..")")
-        return true
+        return "gobbled everything"
 end
 
 -- #################################################################################################
@@ -90,7 +90,7 @@ local group_uid = 1
 local function ziva1( preloop, loop, batch)
         -- prefill the linda a bit to increase fifo stress
         local top = math.max( preloop, loop)
-        local l = lanes.linda("ziva1("..preloop..":"..loop..":"..batch..")", group_uid)
+        local l = lanes.linda{name = "ziva1("..preloop..":"..loop..":"..batch..")", group = group_uid}
         group_uid = (group_uid % config.nb_user_keepers) + 1
         local t1 = lanes.now_secs()
         for i = 1, preloop do
@@ -123,7 +123,8 @@ local function ziva1( preloop, loop, batch)
                 end
         end
         l:send( "done" ,"are you happy?")
-        lane:join()
+        local r, ret = lane:join()
+        assert(r == true and type(ret) == "string", "got " .. tostring(r) .. " " .. tostring(ret))
         return lanes.now_secs() - t1
 end
 
@@ -165,12 +166,12 @@ end
 
 -- sequential write/read (no parallelization involved)
 local function ziva2( preloop, loop, batch)
-        local l = lanes.linda("ziva2("..preloop..":"..loop..":"..tostring(batch)..")", group_uid)
+        local l = lanes.linda{name = "ziva2("..preloop..":"..loop..":"..tostring(batch)..")", group = group_uid}
         group_uid = (group_uid % config.nb_user_keepers) + 1
         -- prefill the linda a bit to increase fifo stress
-        local top, step = math.max( preloop, loop), (l.batched and batch) and batch or 1
+        local top, step = math.max( preloop, loop), batch or 1
         local batch_send, batch_read
-        if l.batched and batch then
+        if batch then
                 local batch_values = {}
                 for i = 1, batch do
                         table.insert( batch_values, i)
@@ -180,7 +181,7 @@ local function ziva2( preloop, loop, batch)
                         l:send( "key", table_unpack( batch_values))
                 end
                 batch_read = function()
-                        l:receive( l.batched, "key", batch)
+                        l:receive_batched("key", batch)
                 end
         else -- not batched
                 batch_send = function()