Fixed issue with timeouts, and added tests from them.

Author: ColonelThirtyTwo

jitthreads/thread.lua

@@ -155,12 +155,12 @@ Thread.__gc = Thread.destroy
 --- Waits for the thread to terminate, or after the timeout has passed
 -- @param timeout Number of seconds to wait. nil = no timeout
 -- @return True if the thread exited successfully, false and nil
---         if the function returned due to timeout, and
+--         if the function returned due to timeout, or
 --         false and a string error message if the thread terminated
 --         due to an error.
 function Thread:join(timeout)
 	if self.thread == nil then error("invalid thread",2) end
-	if abstractions.thread_join(self.thread) then
+	if abstractions.thread_join(self.thread, timeout) then
 		local r = C.lua_tointeger(self.state, -1)
 		if r ~= 0 then
 			local len_b = int_b()
@@ -169,7 +169,7 @@ function Thread:join(timeout)
 		end
 		return true
 	else
-		return false, Threading.TIMEOUT
+		return false
 	end
 end
 

tests.lua

@@ -2,6 +2,8 @@
 local Tests = {
 	"basic",
 	"mutex",
+	"join_timeout",
+	"mutex_timeout",
 }
 
 for _,f in ipairs(Tests) do

tests/basic.lua

@@ -13,20 +13,25 @@ local function testThread(c, f, ...)
 	thread:destroy()
 end
 
-
+print("Basic hello world thread")
 testThread(1, function()
-	print("Thread 1 says hi!")
+	print("\tThread 1 says hi!")
 end)
+
+print("\nThread error test")
 testThread(2, function()
 	error("Thread 2 has errors.")
 end)
+
+print("\nArguments test")
 testThread(3, function(...)
-	print("Got values:",...)
+	print("\tGot values:",...)
 end, nil, 2, "c", true)
 
+print("\nCdata test")
 local vec = ffi.new("struct {int x, y, z;}", 100,200,300)
 testThread(4, function(v)
 	local ffi = require "ffi"
 	v = ffi.cast("struct {int x,y,z;}*", v)
-	print(v.x, v.y, v.z)
+	print("",v.x, v.y, v.z)
 end, vec)

tests/join_timeout.lua

@@ -0,0 +1,31 @@
+
+local ThreadF = function()
+	local ffi = require "ffi"
+	if ffi.os == "Windows" then
+		ffi.cdef[[void Sleep(uint32_t);]]
+		ffi.C.Sleep(5000)
+	else
+		ffi.cdef[[unsigned int sleep(unsigned int);]]
+		ffi.C.sleep(5)
+	end
+end
+
+local Thread = require "jitthreads.thread"
+local Mutex = require "jitthreads.mutex"
+
+local t = Thread(ThreadF)
+print("Thread will run for 5 seconds. Joining with 1 second timeouts.")
+while true do
+	local ok, err = t:join(1)
+	if ok then
+		print("  Joined")
+		break
+	elseif not err then
+		print("  Timed out")
+	else
+		print("  Error:")
+		print(err)
+		break
+	end
+end
+t:destroy()

tests/mutex.lua

@@ -15,6 +15,8 @@ local function threadMain(threadid, m)
 	end
 end
 
+print("Each thread will try to aquire the mutex 20 times.")
+
 local mutex = Mutex()
 local threads = {}
 for i=1,3 do

tests/mutex_timeout.lua

@@ -0,0 +1,24 @@
+
+local ThreadF = function(m)
+	local ffi = require "ffi"
+	local Mutex = require "jitthreads.Mutex"
+	
+	m = ffi.cast(ffi.typeof("$*",Mutex),m)
+	for i=1,5 do
+		assert(not m:lock(1), "Thread locked the mutex, somehow.")
+		print("Timed out, i=",i)
+	end
+end
+
+local Thread = require "jitthreads.thread"
+local Mutex = require "jitthreads.mutex"
+
+local m = Mutex()
+assert(m:lock(), "Couldn't lock a new mutex")
+
+print("Thread will try to aquire locked mutex 5 times with 1 second timeout")
+local t = Thread(ThreadF, m)
+t:join()
+t:destroy()
+m:unlock()
+m:destroy()