Lane cancellation rework

opt.cancelstep is gone, hook is installed by lane:cancel() if requested
lane:cancel() rework (see doc)

1 files changed, 16 insertions, 16 deletions

diff --git a/tests/fifo.lua b/tests/fifo.lua
index 47db4c9..bef60d5 100644
--- a/tests/fifo.lua
+++ b/tests/fifo.lua
@@ -6,11 +6,11 @@
 
 local lanes = require "lanes".configure{shutdown_timeout=3,with_timers=true}
 
-local linda= lanes.linda( "atom")
-local atomic_inc= lanes.genatomic( linda, "FIFO_n" )
+local linda = lanes.linda( "atom")
+local atomic_inc= lanes.genatomic( linda, "FIFO_n")
 
-assert( atomic_inc()==1 )
-assert( atomic_inc()==2 )
+assert( atomic_inc()==1)
+assert( atomic_inc()==2)
 
 local function FIFO()
     local my_channel= "FIFO"..atomic_inc()
@@ -18,32 +18,32 @@ local function FIFO()
     return {
         -- Giving explicit 'nil' timeout allows numbers to be used as 'my_channel'
         --
-        send= function(self, ...)
-                                        linda:send( nil, my_channel, ... )
-                                end,
+        send = function(self, ...)
+            linda:send( nil, my_channel, ...)
+        end,
         receive = function(self, timeout)
-                                        return linda:receive( timeout, my_channel )
-                                end
+            return linda:receive( timeout, my_channel)
+        end
     }
 end
 
-local A= FIFO()
-local B= FIFO()
+local A = FIFO()
+local B = FIFO()
 
 print "Sending to A.."
-A:send( 1,2,3,4,5 )
+A:send( 1,2,3,4,5)
 
 print "Sending to B.."
-B:send( 'a','b','c' )
+B:send( 'a','b','c')
 
 print "Reading A.."
-print( A:receive( 1.0 ) )
+print( A:receive( 1.0))
 
 print "Reading B.."
-print( B:receive( 2.0 ) )
+print( B:receive( 2.0))
 
 -- Note: A and B can be passed between threads, or used as upvalues
 --       by multiple threads (other parts will be copied but the 'linda'
 --       handle is shared userdata and will thus point to the single place)
-lanes.timer_lane:cancel()
+lanes.timer_lane:cancel() -- hard cancel, 0 timeout
 lanes.timer_lane:join()
\ No newline at end of file