Take all code from Asko Kauppi's SVN server, and push it here so that the github repository becomes the official Lanes source codebase.

Note that Asko's SVN server holds version 2.0.9, whereas this is version 2.0.10, but I don't see any real need to update SVN if it is to become deprecated.

Next steps:
- upgrade the rockspec to the latest version
- make the html help available online somewhere

Signed-off-by: Benoit Germain <bnt.germain@gmail.com>

1 files changed, 24 insertions, 9 deletions

diff --git a/src/lanes.lua b/src/lanes.lua
index c68506d..7ec8c76 100644
--- a/src/lanes.lua
+++ b/src/lanes.lua
@@ -6,7 +6,8 @@
 -- Author: Asko Kauppi <akauppi@gmail.com>
 --
 -- History:
---    Jun-08 AKa: major revise
+--    3-Dec-10  BGe: Added support to generate a lane from a string
+--    Jun-08    AKa: major revise
 --    15-May-07 AKa: pthread_join():less version, some speedup & ability to
 --                   handle more threads (~ 8000-9000, up from ~ 5000)
 --    26-Feb-07 AKa: serialization working (C side)
@@ -15,7 +16,7 @@
 --[[
 ===============================================================================
 
-Copyright (C) 2007-08 Asko Kauppi <akauppi@gmail.com>
+Copyright (C) 2007-10 Asko Kauppi <akauppi@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -89,7 +90,7 @@ ABOUT=
     author= "Asko Kauppi <akauppi@gmail.com>",
     description= "Running multiple Lua states in parallel",
     license= "MIT/X11",
-    copyright= "Copyright (c) 2007-08, Asko Kauppi",
+    copyright= "Copyright (c) 2007-10, Asko Kauppi",
     version= _version,
 }
 
@@ -123,6 +124,14 @@ end
 --
 -- lane_h.state: "pending"/"running"/"waiting"/"done"/"error"/"cancelled"
 --
+-- Note: Would be great to be able to have '__ipairs' metamethod, that gets
+--      called by 'ipairs()' function to custom iterate objects. We'd use it
+--      for making sure a lane has ended (results are available); not requiring
+--      the user to precede a loop by explicit 'h[0]' or 'h:join()'.
+--
+--      Or, even better, 'ipairs()' should start valuing '__index' instead
+--      of using raw reads that bypass it.
+--
 local lane_mt= {
     __index= function( me, k )
                 if type(k) == "number" then
@@ -260,8 +269,9 @@ function gen( ... )
     end
 
     local func= select(n,...)
-    if type(func)~="function" then
-        error( "Last parameter not function: "..tostring(func) )
+    local functype = type(func)
+    if functype ~= "function" and functype ~= "string" then
+        error( "Last parameter not function or string: "..tostring(func))
     end
 
     -- Check 'libs' already here, so the error goes in the right place
@@ -302,9 +312,10 @@ lane_proxy= function( ud )
     local proxy= {
         _ud= ud,
         
-        -- void= me:cancel()
+        -- true|false= me:cancel()
         --
-        cancel= function(me) thread_cancel(me._ud) end,
+        cancel= function(me, time, force) return thread_cancel(me._ud, time, force) end,
+
         
         -- [...] | [nil,err,stack_tbl]= me:join( [wait_secs=-1] )
         --
@@ -495,14 +506,18 @@ if first_time then
     -- We let the timer lane be a "free running" thread; no handle to it
     -- remains.
     --
-    gen( "io", { priority=max_prio }, function()
+    gen( "io", { priority=max_prio, globals={threadName="LanesTimer"} }, function()
 
         while true do
             local next_wakeup= check_timers()
 
             -- Sleep until next timer to wake up, or a set/clear command
             --
-            local secs= next_wakeup and (next_wakeup - now_secs()) or nil
+            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