13 files changed, 542 insertions, 0 deletions

diff --git a/llthreads2/test/test_alive.lua b/llthreads2/test/test_alive.lua
new file mode 100644
index 0000000..ecce163
--- /dev/null
+++ b/llthreads2/test/test_alive.lua
@@ -0,0 +1,35 @@
+local llthreads = require"llthreads"
+local utils     = require "utils"
+local sleep     = utils.sleep
+
+local include = utils.thread_init .. [[
+local llthreads = require"llthreads"
+local sleep = require "utils".sleep
+]]
+
+local thread = llthreads.new(include .. [[
+  sleep(5)
+  return 1,2,3
+]])
+
+assert(nil == thread:alive())
+
+thread:start()
+
+assert(true == thread:alive())
+
+for i = 1, 10 do
+  if not thread:alive() then break end
+  sleep(1)
+end
+
+assert(false == thread:alive())
+
+local ok,a,b,c = thread:join(0)
+assert(ok == true)
+assert(a == 1)
+assert(b == 2)
+assert(c == 3)
+
+print("Done!")
+
diff --git a/llthreads2/test/test_join_detach.lua b/llthreads2/test/test_join_detach.lua
new file mode 100644
index 0000000..533a36f
--- /dev/null
+++ b/llthreads2/test/test_join_detach.lua
@@ -0,0 +1,59 @@
+local llthreads = require"llthreads"
+local utils     = require "utils"
+
+do
+
+local thread = llthreads.new(utils.thread_init .. [[
+  local sleep = require"utils".sleep
+  while true do sleep(1) end
+]])
+
+-- detached + joindable
+thread:start(true, true)
+
+local ok, err = thread:join(0)
+print("thread:join(0): ", ok, err)
+assert(ok == nil)
+assert(err == "timeout")
+
+end
+
+-- enforce collect `thread` object
+-- we should not hungup
+for i = 1, 10 do collectgarbage("collect") end
+
+
+do
+
+local thread = llthreads.new(utils.thread_init .. [[
+  local sleep = require"utils".sleep
+  sleep(1)
+]])
+
+-- detached + joindable
+thread:start(true, true)
+
+local ok, err = thread:join(0)
+print("thread:join(0): ", ok, err)
+assert(ok == nil)
+assert(err == "timeout")
+
+for i = 1, 12 do
+  utils.sleep(5)
+  ok, err = thread:join(0)
+  print("thread:join(0)#" .. i .. ": ", ok, err)
+  if ok then break end
+  assert(err == 'timeout')
+end
+
+assert(ok)
+
+end
+
+-- enforce collect `thread` object
+-- we should not get av
+for i = 1, 10 do collectgarbage("collect") end
+
+
+print("Done!")
+
diff --git a/llthreads2/test/test_join_error.lua b/llthreads2/test/test_join_error.lua
new file mode 100644
index 0000000..90780b1
--- /dev/null
+++ b/llthreads2/test/test_join_error.lua
@@ -0,0 +1,24 @@
+local llthreads = require "llthreads"
+local utils     = require "utils"
+local sleep     = utils.sleep
+
+local include = utils.thread_init .. [[
+local llthreads = require"llthreads"
+local sleep = require "utils".sleep
+]]
+
+local thread = llthreads.new(include .. [[
+  sleep(5)
+]])
+
+thread:start()
+
+local ok, err = thread:join()
+assert(ok  == true)
+assert(err == nil)
+
+local res, ok, err = pcall(thread.join, thread)
+assert(res == true)
+assert(ok  == nil)
+assert(err ~= nil)
+
diff --git a/llthreads2/test/test_join_timeout.lua b/llthreads2/test/test_join_timeout.lua
new file mode 100644
index 0000000..b9cf155
--- /dev/null
+++ b/llthreads2/test/test_join_timeout.lua
@@ -0,0 +1,23 @@
+local llthreads = require"llthreads"
+local utils     = require "utils"
+local sleep     = utils.sleep
+
+local include = utils.thread_init .. [[
+local llthreads = require"llthreads"
+local sleep = require "utils".sleep
+]]
+
+local thread = llthreads.new(include .. [[
+  sleep(5)
+]])
+thread:start()
+local ok, err = thread:join(0)
+print("thread:join(0): ", ok, err)
+assert(ok == nil)
+assert(err == "timeout")
+
+local ok, err = thread:join()
+print("thread:join(): ", ok, err)
+assert(ok, err)
+print("Done!")
+
diff --git a/llthreads2/test/test_llthreads.lua b/llthreads2/test/test_llthreads.lua
new file mode 100644
index 0000000..e0e214b
--- /dev/null
+++ b/llthreads2/test/test_llthreads.lua
@@ -0,0 +1,60 @@
+-- Copyright (c) 2011 by Robert G. Jakabosky <bobby@sharedrealm.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
+-- in the Software without restriction, including without limitation the rights
+-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-- copies of the Software, and to permit persons to whom the Software is
+-- furnished to do so, subject to the following conditions:
+--
+-- The above copyright notice and this permission notice shall be included in
+-- all copies or substantial portions of the Software.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-- THE SOFTWARE.
+
+local llthreads = require"llthreads"
+local sleep     = require"utils".sleep
+
+print("LLThreads version : ", llthreads._VERSION)
+
+local function detached_thread(...)
+        local thread = llthreads.new([[ print("print_detached_thread:", ...) ]], ...)
+        -- start detached thread
+        assert(thread:start(true))
+        return thread
+end
+
+local function print_thread(...)
+        local thread = llthreads.new([[ print("print_thread:", ...); ]], ...)
+        -- start joinable thread
+        assert(thread:start())
+        return thread
+end
+
+local function pass_through_thread(...)
+        local thread = llthreads.new([[ return "pass_thread:", ... ]], ...)
+        -- start joinable thread
+        assert(thread:start())
+        return thread
+end
+
+local thread1 = detached_thread("number:", 1234, "nil:", nil, "bool:", true)
+
+sleep(1)
+
+local thread2 = print_thread("number:", 1234, "nil:", nil, "bool:", true)
+print("thread2:join: results # = ", select('#', thread2:join()))
+
+sleep(1)
+
+local thread3 = pass_through_thread("number:", 1234, "nil:", nil, "bool:", true)
+print("thread3:join:", thread3:join())
+
+sleep(1)
+
diff --git a/llthreads2/test/test_load_llthreads2.lua b/llthreads2/test/test_load_llthreads2.lua
new file mode 100644
index 0000000..11bf0a0
--- /dev/null
+++ b/llthreads2/test/test_load_llthreads2.lua
@@ -0,0 +1,7 @@
+local llthreads = require"llthreads2"
+
+llthreads.new([[
+  local os = require "os"
+  print("Done!")
+  os.exit(0)
+]]):start():join()
\ No newline at end of file
diff --git a/llthreads2/test/test_logger.lua b/llthreads2/test/test_logger.lua
new file mode 100644
index 0000000..f85a896
--- /dev/null
+++ b/llthreads2/test/test_logger.lua
@@ -0,0 +1,24 @@
+local utils = require "utils"
+
+require "llthreads".new(utils.thread_init .. [[
+require "string"
+
+require "llthreads".set_logger(function(msg)
+  if type(msg) ~= 'string' then
+    print("ERROR! Invalid error message: ", msg)
+    os.exit(-2)
+  end
+  if not msg:find("SOME ERROR", nil, true) then
+    print("ERROR! Invalid error message: ", msg)
+    os.exit(-1)
+  end
+  print("Done!")
+  os.exit(0)
+end)
+
+error("SOME ERROR")
+]]):start():join()
+
+print("ERROR! Logger has not been call!")
+os.exit(-1)
+
diff --git a/llthreads2/test/test_pass_cfunction.lua b/llthreads2/test/test_pass_cfunction.lua
new file mode 100644
index 0000000..86fcd3d
--- /dev/null
+++ b/llthreads2/test/test_pass_cfunction.lua
@@ -0,0 +1,17 @@
+local llthreads = require"llthreads"
+local utils     = require"utils"
+
+local thread = llthreads.new(utils.thread_init .. [[
+  require "llthreads"
+  local fn = ...
+
+  if type(fn) ~= 'function' then
+    print("ERROR! No function : ", fn, type(fn))
+    os.exit(-2)
+  end
+
+  fn("print('Done!'); require'os'.exit(0)"):start():join()
+]], llthreads.new)
+
+print(thread:start():join())
+os.exit(-1)
\ No newline at end of file
diff --git a/llthreads2/test/test_register_ffi.lua b/llthreads2/test/test_register_ffi.lua
new file mode 100644
index 0000000..e98167f
--- /dev/null
+++ b/llthreads2/test/test_register_ffi.lua
@@ -0,0 +1,14 @@
+if jit then
+  local llthreads = require "llthreads"
+  local thread = llthreads.new([[
+    if not package.preload.ffi then
+      print("ffi does not register in thread")
+      os.exit(-1)
+    end
+    local ok, err = pcall(require, "ffi")
+    if not ok then
+      print("can not load ffi: ", err)
+      os.exit(-2)
+    end
+  ]]):start():join()
+end
diff --git a/llthreads2/test/test_register_llthreads.lua b/llthreads2/test/test_register_llthreads.lua
new file mode 100644
index 0000000..5b234a9
--- /dev/null
+++ b/llthreads2/test/test_register_llthreads.lua
@@ -0,0 +1,15 @@
+-- Test if you build module with
+-- LLTHREAD_REGISTER_THREAD_LIBRARY
+
+local llthreads = require "llthreads"
+local thread = llthreads.new([[
+    if not package.preload.llthreads then
+      print("llthreads does not register in thread")
+      os.exit(-1)
+    end
+    local ok, err = pcall(require, "llthreads")
+    if not ok then
+      print("can not load llthreads: ", err)
+      os.exit(-2)
+    end
+]]):start():join()
diff --git a/llthreads2/test/test_table_copy.lua b/llthreads2/test/test_table_copy.lua
new file mode 100644
index 0000000..0408ad3
--- /dev/null
+++ b/llthreads2/test/test_table_copy.lua
@@ -0,0 +1,134 @@
+-- Copyright (c) 2011 by Robert G. Jakabosky <bobby@sharedrealm.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
+-- in the Software without restriction, including without limitation the rights
+-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-- copies of the Software, and to permit persons to whom the Software is
+-- furnished to do so, subject to the following conditions:
+--
+-- The above copyright notice and this permission notice shall be included in
+-- all copies or substantial portions of the Software.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-- THE SOFTWARE.
+
+local llthreads = require"llthreads"
+
+local sleep
+local status, socket = pcall(require,"socket")
+if status then
+        sleep = function(secs)
+                return socket.sleep(secs)
+        end
+else
+        sleep = function(secs)
+                os.execute("sleep " .. tonumber(secs))
+        end
+end
+
+local dump_code = [==[
+local function dump_recur(seen, obj, depth)
+        local out
+        local t = type(obj)
+        -- if not a table just convert to string.
+        if t ~= "table" then
+                if t == "string" then
+                        return '"' .. obj .. '"'
+                end
+                return tostring(obj)
+        end
+        -- check if this table has been seen already.
+        if seen[obj] then 
+                return "Already dumped " .. tostring(obj)
+        end
+        seen[obj] = true
+        -- restrict max depth.
+        if depth >= 10 then
+                return "{... max depth reached ...}"
+        end
+        depth = depth + 1
+        -- output table key/value pairs
+        local tabs = string.rep("  ",depth)
+        local out = "{\n"
+        for k,v in pairs(obj) do
+                if type(k) ~= "number" then
+                        out = out .. tabs .. '[' .. dump_recur(seen, k, depth) .. '] = ' ..
+                                dump_recur(seen, v, depth) .. ',\n'
+                else
+                        out = out .. tabs .. '[' .. k .. '] = ' .. dump_recur(seen, v, depth) .. ',\n'
+                end
+        end
+        return out .. tabs:sub(1,-3) .. "}"
+end
+
+local obj = ...
+local seen = {}
+return dump_recur(seen, obj, 0)
+]==]
+
+local dump = (loadstring or load)(dump_code)
+
+local child_code = [==[
+local dump = (loadstring or load)[[
+]==] .. dump_code .. [==[
+]]
+local args = ...
+
+print("Child thread args:", dump(args))
+
+-- return all values.
+return ...
+]==]
+
+local function test_thread_value_copying(...)
+        local args = {...}
+        print("Main thread args:", dump(args))
+        local thread = llthreads.new(child_code, args)
+        -- start joinable thread
+        assert(thread:start())
+
+        local status, results = thread:join()
+        print("Main thread results:", dump(results))
+end
+
+-- create some tables.
+local a1 = { "a1" }
+local a2 = { "a2" }
+local a3 = { "a3" }
+local a4 = { "a4" }
+local b1 = { a1, a2, a3, a4 }
+local b2 = { a1=a1, a2=a2, a3=a3, a4=a4 }
+
+--
+-- no loops
+--
+test_thread_value_copying(b1, b2)
+
+local top = {}
+-- self reference.
+top.top = top
+top[top] = top
+-- nested reference.
+top.sub1 = { sub2 = { sub3 = { top } } }
+
+--
+-- loops
+--
+test_thread_value_copying(top)
+
+--
+-- Test max depth
+--
+local outer = {}
+for n=1,100 do
+        outer = {outer}
+end
+local status, err = pcall(test_thread_value_copying,outer)
+assert(not status, "Assertion failed: max depth test failed.")
+
diff --git a/llthreads2/test/test_threads.lua b/llthreads2/test/test_threads.lua
new file mode 100644
index 0000000..459604d
--- /dev/null
+++ b/llthreads2/test/test_threads.lua
@@ -0,0 +1,67 @@
+-- Copyright (c) 2011 by Ross Anderson <ross_j_anderson@yahoo.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
+-- in the Software without restriction, including without limitation the rights
+-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-- copies of the Software, and to permit persons to whom the Software is
+-- furnished to do so, subject to the following conditions:
+--
+-- The above copyright notice and this permission notice shall be included in
+-- all copies or substantial portions of the Software.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-- THE SOFTWARE.
+
+-- Sub-thread processing example in Lua using llthreads - 1,000 quick sub-thread execution
+
+-- luajit sub_threads.lua
+
+local llthreads = require"llthreads"
+local utils     = require "utils"
+
+local num_threads = tonumber(arg[1] or 1000)
+ 
+-- level 0 string literal enclosure [[  ]] of child execution code
+local thread_code = utils.thread_init .. [[
+
+    local num_threads = ...
+    print("CHILD: received from ROOT params:", ...)    
+    local llthreads = require"llthreads" -- need to re-declare this under this scope
+    local t = {} -- thread storage table
+
+    -- create a new child sub-thread execution code - it requires level 1 literal string [=[ ]=] enclosures, level 2 would be [==[ ]==]
+    local executed_child_code = [=[ 
+        return "Hello from child sub-thread, new input params:", ... 
+    ]=]
+
+    -- create 1000 sub-threads - which creates an incremental 30% / 20% utilization spike on the two AMD cpu cores
+    print("CHILD: Create sub threads:", num_threads)
+    for i=1,num_threads do
+        -- create child sub-thread with code to execute and the input parmeters
+        local thread = llthreads.new(executed_child_code , "number:", 1000 + i, "nil:", nil, "bool:", true) 
+        assert(thread:start()) -- start new child sub-thread
+        table.insert(t, thread) -- append the thread at the end of the thread table
+    end
+
+    -- wait (block) for all child sub-threads to complete before returning to ROOT
+    while true do
+        -- always wait on the first element, since order is not important        
+        print("CHILD: sub-thread returned: ", t[1]:join()) 
+        table.remove(t,1) -- always remove the first element
+        if (#t == 0) then break end
+    end
+    return ...  -- return the parents' input params back to the root
+]]
+
+-- create child thread.
+local thread = llthreads.new(thread_code, num_threads, "number:", 1000, "nil:", nil, "bool:", true)
+-- start joinable child thread.
+assert(thread:start())
+-- wait for all child and child sub-threads to finish
+print("ROOT: child returned: ", thread:join())
diff --git a/llthreads2/test/utils.lua b/llthreads2/test/utils.lua
new file mode 100644
index 0000000..d9b5fe5
--- /dev/null
+++ b/llthreads2/test/utils.lua
@@ -0,0 +1,63 @@
+local lua_version_t
+local function lua_version()
+  if not lua_version_t then 
+    local version = rawget(_G,"_VERSION")
+    local maj,min = version:match("^Lua (%d+)%.(%d+)$")
+    if maj then                         lua_version_t = {tonumber(maj),tonumber(min)}
+    elseif not math.mod then            lua_version_t = {5,2}
+    elseif table.pack and not pack then lua_version_t = {5,2}
+    else                                lua_version_t = {5,2} end
+  end
+  return lua_version_t[1], lua_version_t[2]
+end
+
+local LUA_MAJOR, LUA_MINOR = lua_version()
+local IS_LUA_51 = (LUA_MAJOR == 5) and (LUA_MINOR == 1)
+local IS_LUA_52 = (LUA_MAJOR == 5) and (LUA_MINOR == 2)
+
+local LUA_INIT = "LUA_INIT"
+local LUA_INIT_VER
+if not IS_LUA_51 then
+  LUA_INIT_VER = LUA_INIT .. "_" .. LUA_MAJOR .. "_" .. LUA_MINOR
+end
+
+LUA_INIT = LUA_INIT_VER and os.getenv( LUA_INIT_VER ) or os.getenv( LUA_INIT ) or ""
+
+LUA_INIT = [[do 
+  local lua_init = ]] .. ("%q"):format(LUA_INIT) .. [[
+  if lua_init and #lua_init > 0 then
+    if lua_init:sub(1,1) == '@' then
+        dofile(lua_init:sub(2))
+    else
+        assert((loadstring or load)(lua_init))()
+    end
+  end
+end;]]
+
+local sleep
+local status, socket = pcall(require,"socket")
+if status then
+  sleep = function(secs)
+    return socket.sleep(secs)
+  end
+end
+
+if not sleep then
+  local status, ztimer = pcall(require, "lzmq.timer")
+  if status then
+    sleep = function(secs)
+      ztimer.sleep(secs * 1000)
+    end
+  end
+end
+
+if not sleep then
+  sleep = function(secs)
+    os.execute("sleep " .. tonumber(secs))
+  end
+end
+
+return {
+  thread_init = LUA_INIT,
+  sleep       = sleep,
+}