diff options
author | Benoit Germain <bnt.germain@gmail.com> | 2012-09-26 21:22:30 +0200 |
---|---|---|
committer | Benoit Germain <bnt.germain@gmail.com> | 2012-09-26 21:22:30 +0200 |
commit | bba4ecea15320dfbf8edf35f7361de374d895ace (patch) | |
tree | 73bd0bfd29d2c4dbfe3a46681b0e3b2261352207 /src/lanes.lua | |
parent | 282f59ca02d1d1f304b9126b84a8b1427caf3172 (diff) | |
download | lanes-bba4ecea15320dfbf8edf35f7361de374d895ace.tar.gz lanes-bba4ecea15320dfbf8edf35f7361de374d895ace.tar.bz2 lanes-bba4ecea15320dfbf8edf35f7361de374d895ace.zip |
version 3.4.0
* new method linda:dump() that outputs the full contents of a linda as a table, also linked to __towatch for Decoda support
* linda:receive() API change!
* instead of [val, key], linda:receive( timeout, key) returns [key, val]
* instead of [val, [...]], linda:receive( timeout, linda.batched key) returns [key, val[, ...]]
this is to unify the return values of regular and batched mode, and to be able to tell when batched mode is interrupted by a lane cancellation
* fixed Lua 5.2 build to take into account the "loaders"->"searchers" name change in 'package' module.
* a bit of html cleanup and added some infos in the documentation regarding the Lanes internals
Diffstat (limited to 'src/lanes.lua')
-rw-r--r-- | src/lanes.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lanes.lua b/src/lanes.lua index c9ab07d..20168b8 100644 --- a/src/lanes.lua +++ b/src/lanes.lua | |||
@@ -488,10 +488,10 @@ if first_time then | |||
488 | secs = next_wakeup - now_secs() | 488 | secs = next_wakeup - now_secs() |
489 | if secs < 0 then secs = 0 end | 489 | if secs < 0 then secs = 0 end |
490 | end | 490 | end |
491 | local linda = timer_gateway:receive( secs, TGW_KEY) | 491 | local _, linda = timer_gateway:receive( secs, TGW_KEY) |
492 | 492 | ||
493 | if linda then | 493 | if linda then |
494 | local key, wakeup_at, period = timer_gateway:receive( 0, timer_gateway_batched, TGW_KEY, 3) | 494 | local _, key, wakeup_at, period = timer_gateway:receive( 0, timer_gateway_batched, TGW_KEY, 3) |
495 | assert( key) | 495 | assert( key) |
496 | set_timer( linda, key, wakeup_at, period and period > 0 and period or nil) | 496 | set_timer( linda, key, wakeup_at, period and period > 0 and period or nil) |
497 | --elseif secs == nil then -- got no value while block-waiting? | 497 | --elseif secs == nil then -- got no value while block-waiting? |