* Fixed spelling, started ideaing for 16.0.0 * Updated files * Updated readme * Updated version * Concat conns now properly transfer events * Testing types * Connections can be % with functions * Updated connections * Fixed issue with double thread activations (Looking for another solution) * Working on issue with love threaded functions not waiting when in a thread * Working on issue where threads created in threads don't work * Fixed broken threads for love * Fixed some issues with threads * removed test * Updated changes.md * Plan on testing parity between the threading modules * Writing tests for system threading * Added test cases for threading, fixed issues. Todo test love2d * Fixed love2d to succeed with tests * All tests working * Updated files for testing * Modified tests to make it more seamless * removed extra __cores in lanes/pseudo * Working on new priority scheme * Working on priority management * Working on custom prioritySchemes * Fixed issues with missing code * Threaded processors * THREAD.exposeENV(), thread:newProcessor() * Typo in changes.md * Fixed typo in pseudoManager * fixing * Trying to fix exposeENV with pseudoThreading * Changes to threads * updated changes.md * Working on systemthreadedprocess, and experimental newProxy for threading * newProxy and STP work * newProxy implemented * Proxies work with connections now :D * Added tstep to STP, updated changes.md * thread.hold(proxy.conn) * Clean up connection events when holding, working on scheduling tasks/threads to system threaded processors * Getting loads of processors implemented * Finished getLoad(type) * Fixed some bugs * Added an easy way to share a table, found some limitations with lanes threading. * THREAD_NAME set for main thread, connections break the rules for proxies * Testing * Really close to portable proxies, currently extreamly unstable! * Debugging what is going on... * Fixed critical issue with coroutine based threads * Removed extra bloat, proxies are portable now! * Started work on the debugManager * Testing actions, fixing bugs with lanes * Testing... * fixing actions * typo fixed * Throw an error when things break * fixing stuff * Fixed issue with errors not going through * Removed system threaded connections, soon to be replaced by proxies * Testing love2d tests * Test love2d * Use later love-build * Use ubuntu for build * Fixed path * Use appimage * use sudo * No window for love2d * Fixed love2d tests * Testing love2d * Use workspace * Moved other tests while testing * actually pull the repo * packagepath set * Fixed pull * Update multi * Removed link * Edited symlink * Added timeout to build * Rewriting loveManager, too much outdated code * Still implementing new love2d threading code * Rewriting love2d threading binding * Working on adding a Hold method to all objects. Will document how they all work when done. * jobqueues having isues with stp * new pack/unpack for tables, current issue is things being turned into strings * Fixed packing of values into threads, need to fix system proxies and system threaded processors * testing... * Not hard crashing when error is encountered * Should now push non 0 exit codes * Push error when an error happens * Closer to getting things working... * Working on new type system, planning out debugmanager * Fixed error code issue * Test for 5.1 * Planning out debugManager * Some work on the debug manager, proxies working on lanes, todo get pseudo manager and love2d working * Working on getting pseudoThreading tests to work * Added function / connection * Added boost method * Document new features to conns, todo fix newTask * Fixed newTask() * Updated changes.md and fixed some bugs * Added thread.defer(func) * Fixed tests on lanes and pseudo threading, todo fix love2d threading * Fixed paths * Working on paths * Testing paths * Add test for rockspec * Fixed issues * Fixed typo * Added test for defer * Threading working in love2d * Fixed, conf * lanes uses a threaded function like waitfor function * Cleaned up changes.md * added priorityManager to rockspec
222 lines
6.1 KiB
Lua
222 lines
6.1 KiB
Lua
--[[
|
|
MIT License
|
|
|
|
Copyright (c) 2022 Ryan Ward
|
|
|
|
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, sub-license, 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.
|
|
]]
|
|
-- TODO make compatible with lovr
|
|
require("lovr.timer")
|
|
require("lovr.system")
|
|
require("lovr.data")
|
|
local socket = require("socket")
|
|
local multi, thread = require("multi").init()
|
|
local threads = {}
|
|
function threads.loadDump(d)
|
|
return loadstring(d:getString())
|
|
end
|
|
function threads.dump(func)
|
|
return lovr.data.newByteData(string.dump(func))
|
|
end
|
|
local fRef = {"func",nil}
|
|
local function manage(channel, value)
|
|
channel:clear()
|
|
if type(value) == "function" then
|
|
fRef[2] = THREAD.dump(value)
|
|
channel:push(fRef)
|
|
return
|
|
else
|
|
channel:push(value)
|
|
end
|
|
end
|
|
local function RandomVariable(length)
|
|
local res = {}
|
|
math.randomseed(socket.gettime()*10000)
|
|
for i = 1, length do
|
|
res[#res+1] = string.char(math.random(97, 122))
|
|
end
|
|
return table.concat(res)
|
|
end
|
|
local GNAME = "__GLOBAL_"
|
|
local proxy = {}
|
|
function threads.set(name,val)
|
|
if not proxy[name] then proxy[name] = lovr.thread.getChannel(GNAME..name) end
|
|
proxy[name]:performAtomic(manage, val)
|
|
end
|
|
function threads.get(name)
|
|
if not proxy[name] then proxy[name] = lovr.thread.getChannel(GNAME..name) end
|
|
local dat = proxy[name]:peek()
|
|
if type(dat)=="table" and dat[1]=="func" then
|
|
return THREAD.loadDump(dat[2])
|
|
else
|
|
return dat
|
|
end
|
|
end
|
|
function threads.waitFor(name)
|
|
if thread.isThread() then
|
|
return thread.hold(function()
|
|
return threads.get(name)
|
|
end)
|
|
end
|
|
while threads.get(name)==nil do
|
|
lovr.timer.sleep(.001)
|
|
end
|
|
local dat = threads.get(name)
|
|
if type(dat) == "table" and dat.init then
|
|
dat.init = threads.loadDump(dat.init)
|
|
end
|
|
return dat
|
|
end
|
|
function threads.package(name,val)
|
|
local init = val.init
|
|
val.init=threads.dump(val.init)
|
|
GLOBAL[name]=val
|
|
val.init=init
|
|
end
|
|
function threads.getCores()
|
|
return lovr.system.getProcessorCount()
|
|
end
|
|
function threads.kill()
|
|
error("Thread Killed!")
|
|
end
|
|
function threads.getThreads()
|
|
local t = {}
|
|
for i=1,GLOBAL["__THREAD_COUNT"] do
|
|
t[#t+1]=GLOBAL["__THREAD_"..i]
|
|
end
|
|
return t
|
|
end
|
|
function threads.getThread(n)
|
|
return GLOBAL["__THREAD_"..n]
|
|
end
|
|
function threads.getName()
|
|
return __THREADNAME__
|
|
end
|
|
function threads.getID()
|
|
return __THREADID__
|
|
end
|
|
function threads.sleep(n)
|
|
lovr.timer.sleep(n)
|
|
end
|
|
function threads.getGlobal()
|
|
return setmetatable({},
|
|
{
|
|
__index = function(t, k)
|
|
return THREAD.get(k)
|
|
end,
|
|
__newindex = function(t, k, v)
|
|
THREAD.set(k,v)
|
|
end
|
|
}
|
|
)
|
|
end
|
|
function threads.createTable(n)
|
|
local _proxy = {}
|
|
local function set(name,val)
|
|
if not _proxy[name] then _proxy[name] = lovr.thread.getChannel(n..name) end
|
|
_proxy[name]:performAtomic(manage, val)
|
|
end
|
|
local function get(name)
|
|
if not _proxy[name] then _proxy[name] = lovr.thread.getChannel(n..name) end
|
|
local dat = _proxy[name]:peek()
|
|
if type(dat)=="table" and dat[1]=="func" then
|
|
return THREAD.loadDump(dat[2])
|
|
else
|
|
return dat
|
|
end
|
|
end
|
|
return setmetatable({},
|
|
{
|
|
__index = function(t, k)
|
|
return get(k)
|
|
end,
|
|
__newindex = function(t, k, v)
|
|
set(k,v)
|
|
end
|
|
}
|
|
)
|
|
end
|
|
function threads.getConsole()
|
|
local c = {}
|
|
c.queue = lovr.thread.getChannel("__CONSOLE__")
|
|
function c.print(...)
|
|
c.queue:push(multi.pack(...))
|
|
end
|
|
function c.error(err)
|
|
c.queue:push{"ERROR in <"..__THREADNAME__..">: "..err,__THREADID__}
|
|
error(err)
|
|
end
|
|
return c
|
|
end
|
|
if not ISTHREAD then
|
|
local clock = os.clock
|
|
local lastproc = clock()
|
|
local queue = lovr.thread.getChannel("__CONSOLE__")
|
|
thread:newThread("consoleManager",function()
|
|
while true do
|
|
thread.yield()
|
|
dat = queue:pop()
|
|
if dat then
|
|
lastproc = clock()
|
|
print(multi.unpack(dat))
|
|
end
|
|
if clock()-lastproc>2 then
|
|
thread.sleep(.1)
|
|
end
|
|
end
|
|
end)
|
|
end
|
|
function threads.createStaticTable(n)
|
|
local __proxy = {}
|
|
local function set(name,val)
|
|
if __proxy[name] then return end
|
|
local chan = lovr.thread.getChannel(n..name)
|
|
if chan:getCount()>0 then return end
|
|
chan:performAtomic(manage, val)
|
|
__proxy[name] = val
|
|
end
|
|
local function get(name)
|
|
if __proxy[name] then return __proxy[name] end
|
|
local dat = lovr.thread.getChannel(n..name):peek()
|
|
if type(dat)=="table" and dat[1]=="func" then
|
|
__proxy[name] = THREAD.loadDump(dat[2])
|
|
return __proxy[name]
|
|
else
|
|
__proxy[name] = dat
|
|
return __proxy[name]
|
|
end
|
|
end
|
|
return setmetatable({},
|
|
{
|
|
__index = function(t, k)
|
|
return get(k)
|
|
end,
|
|
__newindex = function(t, k, v)
|
|
set(k,v)
|
|
end
|
|
}
|
|
)
|
|
end
|
|
function threads.hold(n)
|
|
local dat
|
|
while not(dat) do
|
|
dat = n()
|
|
end
|
|
end
|
|
return threads |