1 files changed, 45 insertions, 16 deletions

diff --git a/src/lanes.lua b/src/lanes.lua
index 98f8c20..c5b3315 100644
--- a/src/lanes.lua
+++ b/src/lanes.lua
@@ -96,6 +96,7 @@ local default_params =
     -- it looks also like LuaJIT allocator may not appreciate direct use of its allocator for other purposes than the VM operation
     internal_allocator = isLuaJIT and "libc" or "allocator",
     keepers_gc_threshold = -1,
+    linda_wake_period = 'never',
     nb_user_keepers = 0,
     on_state_create = nil,
     shutdown_timeout = 0.25,
@@ -141,6 +142,19 @@ local param_checkers =
         end
         return true
     end,
+    linda_wake_period = function(val_)
+        -- linda_wake_period should be a number > 0, or the string 'never'
+        if val_ == 'never' then
+            return true
+        end
+        if type(val_) ~= "number" then
+            return nil, "not a number"
+        end
+        if val_ <= 0 then
+            return nil, "value out of range"
+        end
+        return true
+    end,
     nb_user_keepers = function(val_)
         -- nb_user_keepers should be a number in [0,100] (so that nobody tries to run OOM by specifying a huge amount)
         if type(val_) ~= "number" then
@@ -266,6 +280,10 @@ local opt_validators =
         local tv = type(v_)
         return (tv == "string") and v_ or raise_option_error("name", tv, v_)
     end,
+    native_priority = function(v_)
+        local tv = type(v_)
+        return (tv == "number") and v_ or raise_option_error("native_priority", tv, v_)
+    end,
     package = function(v_)
         local tv = type(v_)
         return (tv == "table") and v_ or raise_option_error("package", tv, v_)
@@ -281,7 +299,7 @@ local opt_validators =
 }
 
 -- #############################################################################################
--- ##################################### lanes.gen() ###########################################
+-- ################################### lanes.gen/coro() ########################################
 -- #############################################################################################
 
 local process_gen_opt = function(...)
@@ -353,9 +371,16 @@ local process_gen_opt = function(...)
             opt[k] = validator(v)
         end
     end
+
+    -- special case: can't have priority and native_priority at the same time
+    if opt.priority and opt.native_priority then
+        error "priority and native_priority cannot be specified together"
+    end
     return func, libs, opt
 end -- process_gen_opt
 
+-- #################################################################################################
+
 -- lane_h[1..n]: lane results, same as via 'lane_h:join()'
 -- lane_h[0]:    can be read to make sure a thread has finished (gives the number of available results)
 -- lane_h[negative]:   error message, without propagating the error
@@ -394,25 +419,28 @@ end -- process_gen_opt
 -- Calling with a function argument ('lane_func') ends the string/table
 -- modifiers, and prepares a lane generator.
 
--- receives a sequence of strings and tables, plus a function
-local gen = function(...)
+local make_generator = function(is_coro_, ...)
     local func, libs, opt = process_gen_opt(...)
     local core_lane_new = assert(core.lane_new)
-    local priority, globals, package, required, gc_cb, name, error_trace_level = opt.priority, opt.globals, opt.package or package, opt.required, opt.gc_cb, opt.name, error_trace_levels[opt.error_trace_level]
+    local prio_is_native = opt.native_priority and true or false
+    local priority, globals, package, required, gc_cb, name, error_trace_level = opt.priority or opt.native_priority, opt.globals, opt.package or package, opt.required, opt.gc_cb, opt.name, error_trace_levels[opt.error_trace_level]
     return function(...)
         -- must pass functions args last else they will be truncated to the first one
-        return core_lane_new(func, libs, priority, globals, package, required, gc_cb, name, error_trace_level, false, ...)
+        return core_lane_new(func, libs, prio_is_native, priority, globals, package, required, gc_cb, name, error_trace_level, is_coro_, ...)
     end
+end -- make_generator
+
+-- #################################################################################################
+
+-- receives a sequence of strings and tables, plus a function
+local gen = function(...)
+    return make_generator(false, ...)
 end -- gen()
 
+-- #################################################################################################
+
 local coro = function(...)
-    local func, libs, opt = process_gen_opt(...)
-    local core_lane_new = assert(core.lane_new)
-    local priority, globals, package, required, gc_cb, name, error_trace_level = opt.priority, opt.globals, opt.package or package, opt.required, opt.gc_cb, opt.name, error_trace_levels[opt.error_trace_level]
-    return function(...)
-        -- must pass functions args last else they will be truncated to the first one
-        return core_lane_new(func, libs, priority, globals, package, required, gc_cb, name, error_trace_level, true, ...)
-    end
+    return make_generator(true, ...)
 end -- coro()
 
 -- #################################################################################################
@@ -603,7 +631,6 @@ local configure_timers = function()
                 return next_wakeup  -- may be 'nil'
             end -- check_timers()
 
-            local timer_gateway_batched = timerLinda.batched
             set_finalizer(function(err, stk)
                 if err and type(err) ~= "userdata" then
                     error("LanesTimer error: "..tostring(err))
@@ -628,7 +655,7 @@ local configure_timers = function()
 
                 if _timerKey == TGW_KEY then
                     assert(getmetatable(_what) == "Linda") -- '_what' should be a linda on which the client sets a timer
-                    local _, key, wakeup_at, period = timerLinda:receive(0, timer_gateway_batched, TGW_KEY, 3)
+                    local _, key, wakeup_at, period = timerLinda:receive_batched(0, TGW_KEY, 3)
                     assert(key)
                     set_timer(_what, key, wakeup_at, period and period > 0 and period or nil)
                 elseif _timerKey == TGW_QUERY then
@@ -643,7 +670,8 @@ local configure_timers = function()
                 end
             end
         end -- timer_body()
-        timer_lane = gen("lanes_core,table", { name = "LanesTimer", package = {}, priority = core.max_prio }, timer_body)()
+        local min_prio, max_prio = core.thread_priority_range()
+        timer_lane = gen("lanes_core,table", { name = "LanesTimer", package = {}, priority = max_prio }, timer_body)()
     end -- first_time
 
     -----
@@ -758,7 +786,7 @@ local genlock = function(linda_, key_, N)
             -- 'nil' timeout allows 'key_' to be numeric
             return linda_:send(timeout, key_, trues(M_))    -- suspends until been able to push them
         else
-            local _k, _v = linda_:receive(nil, linda_.batched, key_, -M_)
+            local _k, _v = linda_:receive_batched(nil, key_, -M_)
             -- propagate cancel_error if we got it, else return true or false
             return (_v == cancel_error and _v) or (_k and true or false)
         end
@@ -863,6 +891,7 @@ local configure = function(settings_)
     lanes.set_thread_affinity = core.set_thread_affinity
     lanes.set_thread_priority = core.set_thread_priority
     lanes.sleep = core.sleep
+    lanes.thread_priority_range = core.thread_priority_range
     lanes.threads = core.threads or function() error "lane tracking is not available" end -- core.threads isn't registered if settings.track_lanes is false
 
     lanes.gen = gen