Updated test file

multi/init.lua

@@ -1041,13 +1041,13 @@ function multi.holdFor(n,func)
 	end)
 end
 local function cleanReturns(...)
-	local n = select("#", ...)
 	local returns = {...}
 	local rets = {}
 	local ind = 0
-	for i=n,1,-1 do
+	for i=#returns,1,-1 do
 		if returns[i] then
 			ind = i
+			break
 		end
 	end
 	return unpack(returns,1,ind)

multi/integration/lanesManager/threads.lua

@@ -53,11 +53,6 @@ local function INIT(__GlobalLinda,__SleepingLinda)
         until __GlobalLinda:get(name)
         return __GlobalLinda:get(name)
     end
-    if getOS() == "windows" then
-        THREAD.__CORES = tonumber(os.getenv("NUMBER_OF_PROCESSORS"))
-    else
-        THREAD.__CORES = tonumber(io.popen("nproc --all"):read("*n"))
-    end
     function THREAD.getCores()
         return THREAD.__CORES
     end
@@ -92,17 +87,16 @@ local function INIT(__GlobalLinda,__SleepingLinda)
     end
     _G.THREAD_ID = 0
     function THREAD.sleep(n)
-        math.randomseed(os.time())
         __SleepingLinda:receive(n, "__non_existing_variable")
     end
     function THREAD.hold(n)
-        local function wait()
+        while true do
-            math.randomseed(os.time())
             __SleepingLinda:receive(.001, "__non_existing_variable")
+            local tab = {n()}
+            if tab[1] then
+                return unpack(tab)
+            end
         end
-        repeat
-            wait()
-        until n()
     end
     local GLOBAL = {}
     setmetatable(GLOBAL, {

multi/integration/loveManager/threads.lua

@@ -213,9 +213,12 @@ function threads.createStaticTable(n)
     )
 end
 function threads.hold(n)
-    local dat
+    while true do
-    while not(dat) do
+        love.timer.sleep(.001)
-        dat = n()
+        local tab = {n()}
+        if tab[1] then
+            return unpack(tab)
+        end
     end
 end
 return threads

multi/integration/pesudoManager/threads.lua

@@ -48,19 +48,12 @@ local function INIT(env)
         print("Waiting",thread)
         return thread.hold(function() return GLOBAL[name] end)
     end
-    if getOS() == "windows" then
-        THREAD.__CORES = tonumber(os.getenv("NUMBER_OF_PROCESSORS"))
-    else
-        THREAD.__CORES = tonumber(io.popen("nproc --all"):read("*n"))
-    end
     function THREAD.getCores()
         return THREAD.__CORES
     end
     function THREAD.getConsole()
         local c = {}
-        function c.print(...)
+        c.print = print
-            print(...)
-        end
         function c.error(err)
             error("ERROR in <"..GLOBAL["$__THREADNAME__"]..">: "..err)
         end
@@ -69,14 +62,7 @@ local function INIT(env)
     function THREAD.getThreads()
         return {} --GLOBAL.__THREADS__
     end
-    if os.getOS() == "windows" then
+    THREAD.__CORES = thread.__CORES
-        THREAD.__CORES = tonumber(os.getenv("NUMBER_OF_PROCESSORS"))
-    else
-        THREAD.__CORES = tonumber(io.popen("nproc --all"):read("*n"))
-    end
-    function THREAD.kill()
-        error("Thread was killed!")
-    end
     function THREAD.getName()
         return GLOBAL["$THREAD_NAME"]
     end

test.lua

@@ -1,3 +1,4 @@
+package.path = "./?/init.lua;"..package.path
 multi,thread = require("multi"):init()
 GLOBAL,THREAD = require("multi.integration.threading"):init() -- Auto detects your enviroment and uses what's available