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 /tests/timer.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 '')
-rw-r--r-- | tests/timer.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/timer.lua b/tests/timer.lua index c6f510b..84e6dec 100644 --- a/tests/timer.lua +++ b/tests/timer.lua | |||
@@ -35,7 +35,7 @@ local caught= {} -- { [T1]= bool, [T2]= bool } | |||
35 | 35 | ||
36 | while true do | 36 | while true do |
37 | io.stderr:write("waiting...\t") | 37 | io.stderr:write("waiting...\t") |
38 | local v,channel= linda:receive( 6.0, T1,T2 ) | 38 | local channel, v = linda:receive( 6.0, T1,T2 ) |
39 | assert( channel==T1 or channel==T2 ) | 39 | assert( channel==T1 or channel==T2 ) |
40 | caught[channel]= true | 40 | caught[channel]= true |
41 | 41 | ||
@@ -89,6 +89,6 @@ assert( linda:get(T2) == nil ) | |||
89 | 89 | ||
90 | PRINT "...making sure no ticks are coming..." | 90 | PRINT "...making sure no ticks are coming..." |
91 | 91 | ||
92 | local v= linda:receive( 1.5, T1,T2 ) -- should not get any | 92 | local k,v= linda:receive( 10, T1,T2 ) -- should not get any |
93 | assert(v==nil) | 93 | assert(v==nil) |
94 | 94 | ||