4 files changed, 47 insertions, 35 deletions

diff --git a/CHANGES b/CHANGES
index f2b1ba2..52b0349 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
 
 CHANGES:
 
+CHANGE 39: BGe 23-Jun-2012
+   * lanes.timer() accepts a first_secs=nil to stop a timer
+   * timer lane catches errors and prints them
+   * fixed some typos in manual
+
 CHANGE 38: BGe 11-Jun-2012
    * linda:receive() batched mode now accepts a max_count optional argument
 
diff --git a/docs/index.html b/docs/index.html
index 1ae1855..52ba852 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -56,7 +56,7 @@
 
 <p><br/><font size="-1"><i>Copyright &copy; 2007-12 Asko Kauppi, Benoit Germain. All rights reserved.</i>
     <br>Lua Lanes is published under the same <A HREF="http://en.wikipedia.org/wiki/MIT_License">MIT license</A> as Lua 5.1.
-    </p><p>This document was revised on 17-Feb-11, and applies to version 3.1.3
+    </p><p>This document was revised on 23-Jun-12, and applies to version 3.1.4
 </font></p>
 
 </center>
@@ -509,7 +509,7 @@ It is also possible to manually test for cancel requests with <tt>cancel_test()<
 <table border=1 bgcolor="#E0E0FF" cellpadding=10><tr><td>
     <code>set_finalizer( finalizer_func )</code>
     <br/><br/>
-    <code>void= finalizer_func( [error] )</code>
+    <code>void= finalizer_func( [err, stack_tbl] )</code>
 </table>
 
 <p>The <tt>error</tt> call is used for throwing exceptions in Lua. What Lua
@@ -734,7 +734,7 @@ events to a common Linda, but... :).</font>
 </table>
 
 <p>
-    Timers are implemented as a lane. They can be disabled by passing <tt>"NO_TIMERS"</tt>
+    Timers are implemented as a lane. They can be disabled by setting <tt>"with_timers"</tt> to <tt>nil</tt> or <tt>false</tt>
     to <tt>lanes.configure()</tt>.
   </p>
 <p>
@@ -748,7 +748,7 @@ Once a timer expires, the <tt>key</tt> is set with the current time
 The key can be waited upon using the regular Linda <tt>:receive()</tt>
 method.
 </p><p>
-A timer can be stopped simply by <tt>first_secs=0</tt> and no period.
+A timer can be stopped simply with <tt>first_secs=0|nil</tt> and no period.
 </p><p>
 
 <table border=1 bgcolor="#FFFFE0" width=500><tr><td>
diff --git a/src/lanes.c b/src/lanes.c
index 931af98..b1c4018 100644
--- a/src/lanes.c
+++ b/src/lanes.c
@@ -51,7 +51,7 @@
  *      ...
  */
 
-char const* VERSION = "3.1.3";
+char const* VERSION = "3.1.4";
 
 /*
 ===============================================================================
diff --git a/src/lanes.lua b/src/lanes.lua
index dffd017..5aeeaf4 100644
--- a/src/lanes.lua
+++ b/src/lanes.lua
@@ -92,10 +92,10 @@ local error= assert( error )
 
 lanes.ABOUT= 
 {
-    author= "Asko Kauppi <akauppi@gmail.com>",
+    author= "Asko Kauppi <akauppi@gmail.com>, Benoit Germain <bnt.germain@gmail.com>",
     description= "Running multiple Lua states in parallel",
     license= "MIT/X11",
-    copyright= "Copyright (c) 2007-10, Asko Kauppi",
+    copyright= "Copyright (c) 2007-10, Asko Kauppi; (c) 2011-12, Benoit Germain",
     version= _version,
 }
 
@@ -315,7 +315,6 @@ if first_time then
     -- set_timer( linda_h, key [,wakeup_at_secs [,period_secs]] )
     --
     local function set_timer( linda, key, wakeup_at, period )
-
         assert( wakeup_at==nil or wakeup_at>0.0 )
         assert( period==nil or period>0.0 )
 
@@ -429,32 +428,40 @@ if first_time then
     -- We let the timer lane be a "free running" thread; no handle to it
     -- remains.
     --
-    gen( "*", { priority=max_prio}, function() -- "*" instead of "io,package" for LuaJIT compatibility...
-        set_debug_threadname( "LanesTimer")
-        while true do
-            local next_wakeup= check_timers()
-
-            -- Sleep until next timer to wake up, or a set/clear command
-            --
-            local secs
-            if next_wakeup then
-                secs =  next_wakeup - now_secs()
-                if secs < 0 then secs = 0 end
-            end
-            local linda= timer_gateway:receive( secs, TGW_KEY )
-
-            if linda then
-                local key= timer_gateway:receive( 0.0, TGW_KEY )
-                local wakeup_at= timer_gateway:receive( 0.0, TGW_KEY )
-                local period= timer_gateway:receive( 0.0, TGW_KEY )
-                assert( key and wakeup_at and period )
-
-                set_timer( linda, key, wakeup_at, period>0 and period or nil )
-            --elseif secs == nil then -- got no value while block-waiting?
-            --    WR( "timer lane: no linda, aborted?")
-            end
-        end
-    end )()
+        local timer_body = function()
+                local timer_gateway_batched = timer_gateway.batched
+                set_debug_threadname( "LanesTimer")
+                set_finalizer( function( err, stk)
+                        if err and type( err) ~= "userdata" then
+                                WR( "LanesTimer error: "..tostring(err))
+                        --elseif type( err) == "userdata" then
+                        --      WR( "LanesTimer after cancel" )
+                        --else
+                        --      WR("LanesTimer finalized")
+                        end
+                end)
+                while true do
+                        local next_wakeup= check_timers()
+
+                        -- Sleep until next timer to wake up, or a set/clear command
+                        --
+                        local secs
+                        if next_wakeup then
+                                secs =  next_wakeup - now_secs()
+                                if secs < 0 then secs = 0 end
+                        end
+                        local linda = timer_gateway:receive( secs, TGW_KEY)
+
+                        if linda then
+                                local key, wakeup_at, period = timer_gateway:receive( 0, timer_gateway_batched, TGW_KEY, 3)
+                                assert( key)
+                                set_timer( linda, key, wakeup_at, period and period > 0 and period or nil)
+                        --elseif secs == nil then -- got no value while block-waiting?
+                        --      WR( "timer lane: no linda, aborted?")
+                        end
+                end
+        end
+        gen( "*", { priority=max_prio}, timer_body)() -- "*" instead of "io,package" for LuaJIT compatibility...
 end
 
 -----
@@ -479,7 +486,7 @@ timer = function( linda, key, a, period )
     end
 
     local wakeup_at= type(a)=="table" and wakeup_conv(a)    -- given point of time
-                                       or now_secs()+a
+                                       or (a and now_secs()+a or nil)
     -- queue to timer
     --
     timer_gateway:send( TGW_KEY, linda, key, wakeup_at, period )