* 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
138 lines
3.8 KiB
Lua
138 lines
3.8 KiB
Lua
if ISTHREAD then
|
|
error("You cannot require the loveManager from within a thread!")
|
|
end
|
|
|
|
local ThreadFileData = [[
|
|
ISTHREAD = true
|
|
args = {...}
|
|
THREAD_ID = args[1]
|
|
THREAD_NAME = args[2]
|
|
GLOBAL, THREAD, DEFER = require("multi.integration.loveManager.threads"):init()
|
|
__FUNC = THREAD.unpackValue(args[3])
|
|
ARGS = THREAD.unpackValue(args[4])
|
|
settings = args[5]
|
|
if ARGS == nil then ARGS = {} end
|
|
math.randomseed(THREAD_ID)
|
|
math.random()
|
|
math.random()
|
|
math.random()
|
|
stab = THREAD.createTable(THREAD_NAME .. THREAD_ID)
|
|
if GLOBAL["__env"] then
|
|
local env = THREAD.getENV()
|
|
for i,v in pairs(env) do
|
|
_G[i] = v
|
|
end
|
|
end
|
|
multi, thread = require("multi"):init{error=true, warning=true, print=true, priority=true}
|
|
multi.defaultSettings.print = true
|
|
require("multi.integration.loveManager.extensions")
|
|
require("multi.integration.sharedExtensions")
|
|
local returns = {pcall(__FUNC, multi.unpack(ARGS))}
|
|
table.remove(returns,1)
|
|
stab["returns"] = returns
|
|
for i,v in pairs(DEFER) do
|
|
pcall(v)
|
|
end
|
|
]]
|
|
|
|
_G.THREAD_NAME = "MAIN_THREAD"
|
|
_G.THREAD_ID = 0
|
|
|
|
local multi, thread = require("multi"):init()
|
|
local GLOBAL, THREAD = require("multi.integration.loveManager.threads"):init()
|
|
|
|
multi.registerType("s_function")
|
|
multi.registerType("s_thread")
|
|
|
|
multi.integration = {}
|
|
multi.isMainThread = true
|
|
local threads = {}
|
|
local tid = 0
|
|
function multi:newSystemThread(name, func, ...)
|
|
multi.InitSystemThreadErrorHandler()
|
|
local name = name or multi.randomString(16)
|
|
tid = tid + 1
|
|
local c = {}
|
|
c.Type = multi.STHREAD
|
|
c.Name = name
|
|
c.ID = tid
|
|
c.thread = love.thread.newThread(ThreadFileData)
|
|
c.thread:start(c.ID, c.Name, THREAD.packValue(func), THREAD.packValue({...}), multi.defaultSettings)
|
|
c.stab = THREAD.createTable(name .. c.ID)
|
|
c.creationTime = os.clock()
|
|
c.OnDeath = multi:newConnection()
|
|
c.OnError = multi:newConnection()
|
|
c.status_channel = love.thread.getChannel("__status_channel__" .. c.ID)
|
|
|
|
function c:getName() return c.name end
|
|
|
|
table.insert(threads, c)
|
|
|
|
c.OnError(multi.error)
|
|
|
|
if self.isActor then
|
|
self:create(c)
|
|
else
|
|
multi.create(multi, c)
|
|
end
|
|
|
|
return c
|
|
end
|
|
|
|
local started = false
|
|
local console_channel = love.thread.getChannel("__console_channel__")
|
|
|
|
function THREAD:newFunction(func, holdme)
|
|
return thread:newFunctionBase(function(...)
|
|
return multi:newSystemThread("SystemThreaded Function Handler", func, ...)
|
|
end, holdme, multi.SFUNCTION)()
|
|
end
|
|
|
|
function love.threaderror(thread, errorstr)
|
|
multi.error("Thread error! " .. errorstr)
|
|
end
|
|
|
|
function multi.InitSystemThreadErrorHandler()
|
|
if started == true then return end
|
|
started = true
|
|
thread:newThread("Love System Thread Handler", function()
|
|
while true do
|
|
thread.yield()
|
|
for i = #threads, 1, -1 do
|
|
local th = threads[i]
|
|
if th.status_channel:peek() ~= nil then
|
|
th.statusconnector:Fire(multi.unpack(th.status_channel:pop()))
|
|
end
|
|
local th_err = th.thread:getError()
|
|
if th_err == "Thread Killed!\1" then
|
|
th.OnDeath:Fire("Thread Killed!")
|
|
table.remove(threads, i)
|
|
elseif th_err then
|
|
th.OnError:Fire(th, th_err)
|
|
table.remove(threads, i)
|
|
elseif th.stab.returns then
|
|
th.OnDeath:Fire(multi.unpack(th.stab.returns))
|
|
th.stab.returns = nil
|
|
table.remove(threads, i)
|
|
end
|
|
end
|
|
end
|
|
end)
|
|
end
|
|
|
|
THREAD.newSystemThread = function(...)
|
|
multi:newSystemThread(...)
|
|
end
|
|
|
|
multi.integration.GLOBAL = GLOBAL
|
|
multi.integration.THREAD = THREAD
|
|
require("multi.integration.loveManager.extensions")
|
|
require("multi.integration.sharedExtensions")
|
|
multi.print("Integrated Love Threading!")
|
|
|
|
return {
|
|
init = function()
|
|
return GLOBAL, THREAD
|
|
end
|
|
}
|