aboutsummaryrefslogtreecommitdiff
path: root/src/lanes-keeper.lua
diff options
context:
space:
mode:
authorBenoit Germain <bnt.germain@gmail.com>2012-09-26 21:22:30 +0200
committerBenoit Germain <bnt.germain@gmail.com>2012-09-26 21:22:30 +0200
commitbba4ecea15320dfbf8edf35f7361de374d895ace (patch)
tree73bd0bfd29d2c4dbfe3a46681b0e3b2261352207 /src/lanes-keeper.lua
parent282f59ca02d1d1f304b9126b84a8b1427caf3172 (diff)
downloadlanes-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-keeper.lua')
-rw-r--r--src/lanes-keeper.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lanes-keeper.lua b/src/lanes-keeper.lua
index b07d6a9..a03ef4b 100644
--- a/src/lanes-keeper.lua
+++ b/src/lanes-keeper.lua
@@ -187,7 +187,7 @@ function receive( ud, ...)
187 if fifo and fifo.count > 0 then 187 if fifo and fifo.count > 0 then
188 local val = fifo_pop( fifo, 1) 188 local val = fifo_pop( fifo, 1)
189 if val ~= nil then 189 if val ~= nil then
190 return val, key 190 return key, val
191 end 191 end
192 end 192 end
193 end 193 end
@@ -207,7 +207,7 @@ receive_batched = function( ud, key, min_count, max_count)
207 if fifo_count >= min_count then 207 if fifo_count >= min_count then
208 max_count = max_count or min_count 208 max_count = max_count or min_count
209 max_count = (max_count > fifo_count) and fifo_count or max_count 209 max_count = (max_count > fifo_count) and fifo_count or max_count
210 return fifo_pop( fifo, max_count) 210 return key, fifo_pop( fifo, max_count)
211 end 211 end
212 end 212 end
213 end 213 end