Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fe5333512f | |||
| b2ae7181d6 | |||
| 2a8b3d095f | |||
| 68908f093b |
@ -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)
|
||||
|
||||
@ -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()
|
||||
math.randomseed(os.time())
|
||||
while true do
|
||||
__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, {
|
||||
|
||||
@ -213,9 +213,12 @@ function threads.createStaticTable(n)
|
||||
)
|
||||
end
|
||||
function threads.hold(n)
|
||||
local dat
|
||||
while not(dat) do
|
||||
dat = n()
|
||||
while true do
|
||||
love.timer.sleep(.001)
|
||||
local tab = {n()}
|
||||
if tab[1] then
|
||||
return unpack(tab)
|
||||
end
|
||||
end
|
||||
end
|
||||
return threads
|
||||
@ -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(...)
|
||||
print(...)
|
||||
end
|
||||
c.print = print
|
||||
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 = 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
|
||||
THREAD.__CORES = thread.__CORES
|
||||
function THREAD.getName()
|
||||
return GLOBAL["$THREAD_NAME"]
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user