* 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
98 lines
3.2 KiB
Lua
98 lines
3.2 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
|
|
if ISTHREAD then
|
|
error("You cannot require the lovrManager from within a thread!")
|
|
end
|
|
local ThreadFileData = [[
|
|
ISTHREAD = true
|
|
THREAD = require("multi.integration.lovrManager.threads") -- order is important!
|
|
sThread = THREAD
|
|
__IMPORTS = {...}
|
|
__FUNC__=table.remove(__IMPORTS,1)
|
|
__THREADID__=table.remove(__IMPORTS,1)
|
|
__THREADNAME__=table.remove(__IMPORTS,1)
|
|
stab = THREAD.createStaticTable(__THREADNAME__)
|
|
GLOBAL = THREAD.getGlobal()
|
|
multi, thread = require("multi").init()
|
|
stab["returns"] = {THREAD.loadDump(__FUNC__)(multi.unpack(__IMPORTS))}
|
|
]]
|
|
local multi, thread = require("multi.compat.lovr2d"):init()
|
|
local THREAD = {}
|
|
__THREADID__ = 0
|
|
__THREADNAME__ = "MainThread"
|
|
_G.THREAD_NAME = "MAIN_THREAD"
|
|
_G.THREAD_ID = 0
|
|
multi.integration={}
|
|
multi.integration.lovr2d={}
|
|
local THREAD = require("multi.integration.lovrManager.threads")
|
|
local GLOBAL = THREAD.getGlobal()
|
|
local THREAD_ID = 1
|
|
local OBJECT_ID = 0
|
|
local stf = 0
|
|
function THREAD:newFunction(func,holup)
|
|
stf = stf + 1
|
|
return function(...)
|
|
local t = multi:newSystemThread("STF"..stf,func,...)
|
|
return thread:newFunction(function()
|
|
return thread.hold(function()
|
|
if t.stab["returns"] then
|
|
local dat = t.stab.returns
|
|
t.stab.returns = nil
|
|
return multi.unpack(dat)
|
|
end
|
|
end)
|
|
end,holup)()
|
|
end
|
|
end
|
|
function multi:newSystemThread(name,func,...)
|
|
local c = {}
|
|
c.name = name
|
|
c.ID=THREAD_ID
|
|
c.thread=lovr.thread.newThread(ThreadFileData)
|
|
c.thread:start(THREAD.dump(func),c.ID,c.name,...)
|
|
c.stab = THREAD.createStaticTable(name)
|
|
GLOBAL["__THREAD_"..c.ID] = {ID=c.ID,Name=c.name,Thread=c.thread}
|
|
GLOBAL["__THREAD_COUNT"] = THREAD_ID
|
|
THREAD_ID=THREAD_ID+1
|
|
|
|
if self.isActor then
|
|
self:create(c)
|
|
else
|
|
multi.create(multi, c)
|
|
end
|
|
|
|
return c
|
|
end
|
|
THREAD.newSystemThread = multi.newSystemThread
|
|
function lovr.threaderror(thread, errorstr)
|
|
multi.print("Thread error!\n"..errorstr)
|
|
end
|
|
multi.integration.GLOBAL = GLOBAL
|
|
multi.integration.THREAD = THREAD
|
|
require("multi.integration.lovrManager.extensions")
|
|
multi.print("Integrated lovr Threading!")
|
|
return {init=function()
|
|
return GLOBAL,THREAD
|
|
end} |