* 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
246 lines
7.8 KiB
Lua
246 lines
7.8 KiB
Lua
package.path = "D:/VSCWorkspace/?/init.lua;D:/VSCWorkspace/?.lua;"..package.path
|
|
package.cpath = "C:/luaInstalls/lua5.4/lib/lua/5.4/?/core.dll;" .. package.cpath
|
|
multi, thread = require("multi"):init{error=true,warning=true,print=true, priority=true}
|
|
proc = multi:newProcessor("Thread Test",true)
|
|
local LANES, LOVE, PSEUDO = 1, 2, 3
|
|
local env, we_good
|
|
|
|
if love then
|
|
GLOBAL, THREAD = require("multi.integration.loveManager"):init()
|
|
env = LOVE
|
|
elseif arg[1] == "l" then
|
|
GLOBAL, THREAD = require("multi.integration.lanesManager"):init()
|
|
env = LANES
|
|
elseif arg[1] == "p" then
|
|
GLOBAL, THREAD = require("multi.integration.pseudoManager"):init()
|
|
env = PSEUDO
|
|
else
|
|
io.write("Test Pseudo(p), Lanes(l), or love(Run in love environment) Threading: ")
|
|
choice = io.read()
|
|
if choice == "p" then
|
|
GLOBAL, THREAD = require("multi.integration.pseudoManager"):init()
|
|
env = PSEUDO
|
|
elseif choice == "l" then
|
|
GLOBAL, THREAD = require("multi.integration.lanesManager"):init()
|
|
env = LANES
|
|
else
|
|
error("Invalid threading choice")
|
|
end
|
|
end
|
|
|
|
multi.print("Testing THREAD.setENV() if the multi_assert is not found then there is a problem")
|
|
THREAD.setENV({
|
|
multi_assert = function(expected, actual, s)
|
|
if expected ~= actual then
|
|
multi.error(s .. " Expected: '".. tostring(expected) .."' Actual: '".. tostring(actual) .."'")
|
|
end
|
|
end
|
|
})
|
|
|
|
multi:newThread("Scheduler Thread",function()
|
|
multi:newThread(function()
|
|
thread.sleep(30)
|
|
print("Timeout tests took longer than 30 seconds")
|
|
multi:Stop()
|
|
os.exit(1)
|
|
end)
|
|
|
|
queue = multi:newSystemThreadedQueue("Test_Queue")
|
|
defer_queue = multi:newSystemThreadedQueue("Defer_Queue")
|
|
|
|
multi:newSystemThread("Test_Thread_0", function()
|
|
defer_queue = THREAD.waitFor("Defer_Queue"):init()
|
|
|
|
THREAD.defer(function()
|
|
defer_queue:push("done")
|
|
multi.print("This function was defered until the end of the threads life")
|
|
end)
|
|
|
|
multi.print("Testing defer, should print below this")
|
|
|
|
if THREAD_NAME~="Test_Thread_0" then
|
|
multi.error("The name should be Test_Thread_0",THREAD_NAME,THREAD_NAME,_G.THREAD_NAME)
|
|
end
|
|
end)
|
|
|
|
if thread.hold(function()
|
|
return defer_queue:pop() == "done"
|
|
end,{sleep=3}) == nil then
|
|
multi.error("Thread.defer didn't work!")
|
|
end
|
|
|
|
th1 = multi:newSystemThread("Test_Thread_1", function(a,b,c,d,e,f)
|
|
queue = THREAD.waitFor("Test_Queue"):init()
|
|
multi_assert("Test_Thread_1", THREAD_NAME, "Thread name does not match!")
|
|
multi_assert("Passing some args", a, "First argument is not as expected 'Passing some args'")
|
|
multi_assert(true, e, "Argument e is not true!")
|
|
multi_assert("table", type(f), "Argument f is not a table!")
|
|
queue:push("done")
|
|
end,"Passing some args", 1, 2, 3, true, {"Table"}).OnError(function(self,err)
|
|
multi.error(err)
|
|
os.exit(1)
|
|
end)
|
|
|
|
if thread.hold(function()
|
|
return queue:pop() == "done"
|
|
end,{sleep=1}) == nil then
|
|
thread.kill()
|
|
end
|
|
|
|
multi.success("Thread Spawning, THREAD namaspace in threads, global's working, and queues for passing data: Ok")
|
|
|
|
func = THREAD:newFunction(function(a,b,c)
|
|
assert(a == 3, "First argument expected '3' got '".. a .."'!")
|
|
assert(b == 2, "Second argument expected '2' got '".. b .."'!")
|
|
assert(c == 1, "Third argument expected '1' got '".. c .."'!")
|
|
return 1, 2, 3, {"a table"}
|
|
end, true) -- Hold this
|
|
|
|
a, b, c, d = func(3,2,1)
|
|
assert(a == 1, "First return was not '1'!")
|
|
assert(b == 2, "Second return was not '2'!")
|
|
assert(c == 3, "Third return was not '3'!")
|
|
assert(d[1] == "a table", "Fourth return is not table, or doesn't contain 'a table'!")
|
|
|
|
multi.success("Threaded Functions, arg passing, return passing, holding: Ok")
|
|
|
|
test=multi:newSystemThreadedTable("YO"):init()
|
|
test["test1"]="tabletest"
|
|
local worked = false
|
|
|
|
multi:newSystemThread("testing tables",function()
|
|
tab=THREAD.waitFor("YO")
|
|
THREAD.hold(function() return tab["test1"] end)
|
|
THREAD.sleep(.1)
|
|
tab["test2"] = "Whats so funny?"
|
|
end).OnError(multi.error)
|
|
|
|
multi:newThread("test2",function()
|
|
thread.hold(function() return test["test2"] end)
|
|
worked = true
|
|
end)
|
|
|
|
t, val = thread.hold(function()
|
|
return worked
|
|
end,{sleep=2})
|
|
|
|
if val == multi.TIMEOUT then
|
|
multi.error("SystemThreadedTables: Failed")
|
|
os.exit(1)
|
|
end
|
|
|
|
multi.success("SystemThreadedTables: Ok")
|
|
|
|
local ready = false
|
|
|
|
jq = multi:newSystemThreadedJobQueue(4) -- Job queue with 4 worker threads
|
|
func2 = jq:newFunction("sleep",function(a,b)
|
|
THREAD.sleep(.2)
|
|
end)
|
|
func = jq:newFunction("test-thread",function(a,b)
|
|
sleep()
|
|
return a+b
|
|
end)
|
|
local count = 0
|
|
for i = 1,10 do
|
|
func(i, i*3).OnReturn(function(data)
|
|
count = count + 1
|
|
end)
|
|
end
|
|
|
|
t, val = thread.hold(function()
|
|
return count == 10
|
|
end,{sleep=3})
|
|
|
|
if val == multi.TIMEOUT then
|
|
multi.error("SystemThreadedJobQueues: Failed")
|
|
os.exit(1)
|
|
end
|
|
|
|
multi.success("SystemThreadedJobQueues: Ok")
|
|
|
|
local proxy_test = false
|
|
local stp = multi:newSystemThreadedProcessor(5)
|
|
|
|
local tloop = stp:newTLoop(function()
|
|
--print("Test")
|
|
end, 1)
|
|
|
|
multi:newSystemThread("PROX_THREAD",function(tloop)
|
|
local multi, thread = require("multi"):init()
|
|
tloop = tloop:init()
|
|
multi.print("tloop type:",tloop.Type)
|
|
multi.print("Testing proxies on other threads")
|
|
thread:newThread(function()
|
|
while true do
|
|
thread.hold(tloop.OnLoop)
|
|
print(THREAD_NAME,"Loopy")
|
|
end
|
|
end)
|
|
tloop.OnLoop(function(a)
|
|
print(THREAD_NAME, "Got loop...")
|
|
end)
|
|
multi:mainloop()
|
|
end, tloop:getTransferable())
|
|
|
|
local test = tloop:getTransferable()
|
|
|
|
multi.print("tloop", tloop.Type)
|
|
multi.print("tloop.OnLoop", tloop.OnLoop.Type)
|
|
|
|
thread:newThread("Proxy Test Thread",function()
|
|
multi.print("Testing holding on a proxy connection!")
|
|
thread.hold(tloop.OnLoop)
|
|
multi.print("Held on proxy connection... once")
|
|
thread.hold(tloop.OnLoop)
|
|
multi.print("Held on proxy connection... twice")
|
|
thread.hold(tloop.OnLoop)
|
|
multi.print("Held on proxy connection... finally")
|
|
proxy_test = true
|
|
end).OnError(print)
|
|
|
|
thread:newThread(function()
|
|
thread.defer(function()
|
|
multi.print("Something happened!")
|
|
end)
|
|
while true do
|
|
thread.hold(tloop.OnLoop)
|
|
multi.print(THREAD_NAME,"Local Loopy")
|
|
end
|
|
end).OnError(function(...)
|
|
print("Error",...)
|
|
end)
|
|
|
|
tloop.OnLoop(function()
|
|
print("OnLoop", THREAD_NAME)
|
|
end)
|
|
|
|
t, val = thread.hold(function()
|
|
return proxy_test
|
|
end,{sleep=10})
|
|
|
|
if val == multi.TIMEOUT then
|
|
multi.error("SystemThreadedProcessor/Proxies: Failed")
|
|
os.exit(1)
|
|
else
|
|
multi.success("SystemThreadedProcessor: OK")
|
|
end
|
|
|
|
thread.sleep(2)
|
|
|
|
we_good = true
|
|
multi:Stop() -- Needed in love2d tests to stop the main runner
|
|
os.exit(0)
|
|
end)
|
|
|
|
multi.OnExit(function(err_or_errorcode)
|
|
multi.print("EC: ", err_or_errorcode)
|
|
if not we_good then
|
|
multi.print("There was an error running some tests!")
|
|
return
|
|
else
|
|
multi.success("Tests complete!")
|
|
end
|
|
end)
|
|
|
|
multi:mainloop() |