mirror of
https://github.com/rayaman/multi.git
synced 2026-09-04 23:17:35 -04:00
Working on 16.0.0 (#53)
* 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
This commit is contained in:
+192
-184
@@ -1,185 +1,193 @@
|
||||
if os.getenv("LOCAL_LUA_DEBUGGER_VSCODE") == "1" then
|
||||
package.path="multi/?.lua;multi/?/init.lua;multi/?.lua;multi/?/?/init.lua;"..package.path
|
||||
require("lldebugger").start()
|
||||
else
|
||||
package.path = "../?/init.lua;../?.lua;"..package.path
|
||||
end
|
||||
--[[
|
||||
This file runs all tests.
|
||||
Format:
|
||||
Expected:
|
||||
...
|
||||
...
|
||||
...
|
||||
Actual:
|
||||
...
|
||||
...
|
||||
...
|
||||
|
||||
Each test that is ran should have a 5 second pause after the test is complete
|
||||
The expected and actual should "match" (Might be impossible when playing with threads)
|
||||
This will be pushed directly to the master as tests start existing.
|
||||
]]
|
||||
local multi, thread = require("multi"):init{print=true}--{priority=true}
|
||||
local good = false
|
||||
local proc = multi:newProcessor("Test",true)
|
||||
proc:newAlarm(3):OnRing(function()
|
||||
good = true
|
||||
end)
|
||||
|
||||
runTest = thread:newFunction(function()
|
||||
local alarms,tsteps,steps,loops,tloops,updaters,events=false,0,0,0,0,0,false
|
||||
print("Testing Basic Features. If this fails most other features will probably not work!")
|
||||
proc:newAlarm(2):OnRing(function(a)
|
||||
alarms = true
|
||||
a:Destroy()
|
||||
end)
|
||||
proc:newTStep(1,10,1,.1):OnStep(function(t)
|
||||
tsteps = tsteps + 1
|
||||
end):OnEnd(function(step)
|
||||
step:Destroy()
|
||||
end)
|
||||
proc:newStep(1,10):OnStep(function(s)
|
||||
steps = steps + 1
|
||||
end):OnEnd(function(step)
|
||||
step:Destroy()
|
||||
end)
|
||||
local loop = proc:newLoop(function(l)
|
||||
loops = loops + 1
|
||||
end)
|
||||
proc:newTLoop(function(t)
|
||||
tloops = tloops + 1
|
||||
end,.1)
|
||||
local updater = proc:newUpdater(1):OnUpdate(function()
|
||||
updaters = updaters + 1
|
||||
end)
|
||||
local event = proc:newEvent(function()
|
||||
return alarms
|
||||
end)
|
||||
event.OnEvent(function(evnt)
|
||||
evnt:Destroy()
|
||||
events = true
|
||||
print("Alarms: Ok")
|
||||
print("Events: Ok")
|
||||
if tsteps == 10 then print("TSteps: Ok") else print("TSteps: Bad!") end
|
||||
if steps == 10 then print("Steps: Ok") else print("Steps: Bad!") end
|
||||
if loops > 100 then print("Loops: Ok") else print("Loops: Bad!") end
|
||||
if tloops > 10 then print("TLoops: Ok") else print("TLoops: Bad!") end
|
||||
if updaters > 100 then print("Updaters: Ok") else print("Updaters: Bad!") end
|
||||
end)
|
||||
thread.hold(event.OnEvent)
|
||||
print("Starting Connection and Thread tests!")
|
||||
func = thread:newFunction(function(count)
|
||||
print("Starting Status test: ",count)
|
||||
local a = 0
|
||||
while true do
|
||||
a = a + 1
|
||||
thread.sleep(.1)
|
||||
thread.pushStatus(a,count)
|
||||
if a == count then break end
|
||||
end
|
||||
return "Done", true, math.random(1,10000)
|
||||
end)
|
||||
local ret = func(10)
|
||||
local ret2 = func(15)
|
||||
local ret3 = func(20)
|
||||
local s1,s2,s3 = 0,0,0
|
||||
ret.OnError(function(...)
|
||||
print("Func 1:",...)
|
||||
end)
|
||||
ret2.OnError(function(...)
|
||||
print("Func 2:",...)
|
||||
end)
|
||||
ret3.OnError(function(...)
|
||||
print("Func 3:",...)
|
||||
end)
|
||||
ret.OnStatus(function(part,whole)
|
||||
s1 = math.ceil((part/whole)*1000)/10
|
||||
end)
|
||||
ret2.OnStatus(function(part,whole)
|
||||
s2 = math.ceil((part/whole)*1000)/10
|
||||
end)
|
||||
ret3.OnStatus(function(part,whole)
|
||||
s3 = math.ceil((part/whole)*1000)/10
|
||||
end)
|
||||
|
||||
ret.OnReturn(function(...)
|
||||
print("Done 1",...)
|
||||
end)
|
||||
ret2.OnReturn(function(...)
|
||||
print("Done 2",...)
|
||||
end)
|
||||
ret3.OnReturn(function(...)
|
||||
print("Done 3",...)
|
||||
end)
|
||||
|
||||
local err, timeout = thread.hold(ret.OnReturn * ret2.OnReturn * ret3.OnReturn)
|
||||
|
||||
if s1 == 100 and s2 == 100 and s3 == 100 then
|
||||
print("Threads: All tests Ok")
|
||||
else
|
||||
if s1>0 and s2>0 and s3 > 0 then
|
||||
print("Thread OnStatus: Ok")
|
||||
else
|
||||
print("Threads OnStatus or thread.hold(conn) Error!")
|
||||
end
|
||||
if timeout then
|
||||
print("Connection Error!")
|
||||
else
|
||||
print("Connection Test 1: Ok")
|
||||
end
|
||||
print("Connection holding Error!")
|
||||
end
|
||||
|
||||
conn1 = proc:newConnection()
|
||||
conn2 = proc:newConnection()
|
||||
conn3 = proc:newConnection()
|
||||
local c1,c2,c3,c4 = false,false,false,false
|
||||
|
||||
local a = conn1(function()
|
||||
c1 = true
|
||||
end)
|
||||
|
||||
local b = conn2(function()
|
||||
c2 = true
|
||||
end)
|
||||
|
||||
local c = conn3(function()
|
||||
c3 = true
|
||||
end)
|
||||
|
||||
local d = conn3(function()
|
||||
c4 = true
|
||||
end)
|
||||
|
||||
conn1:Fire()
|
||||
conn2:Fire()
|
||||
conn3:Fire()
|
||||
|
||||
if c1 and c2 and c3 and c4 then
|
||||
print("Connection Test 2: Ok")
|
||||
else
|
||||
print("Connection Test 2: Error")
|
||||
end
|
||||
c3 = false
|
||||
c4 = false
|
||||
d:Destroy()
|
||||
conn3:Fire()
|
||||
if c3 and not(c4) then
|
||||
print("Connection Test 3: Ok")
|
||||
else
|
||||
print("Connection Test 3: Error removing connection")
|
||||
end
|
||||
os.exit() -- End of tests
|
||||
end)
|
||||
|
||||
print(runTest().OnError(function(...)
|
||||
print("Error: Something went wrong with the test!")
|
||||
print(...)
|
||||
os.exit(1)
|
||||
end))
|
||||
|
||||
print("Pumping proc")
|
||||
while true do
|
||||
proc.run()
|
||||
package.path = "../?/init.lua;../?.lua;./init.lua;./?.lua;"..package.path
|
||||
|
||||
local multi, thread = require("multi"):init{print=true,warn=true,error=true}--{priority=true}
|
||||
local good = false
|
||||
local proc = multi:newProcessor("Test")
|
||||
|
||||
proc.Start()
|
||||
|
||||
proc:newAlarm(3):OnRing(function()
|
||||
good = true
|
||||
end)
|
||||
|
||||
runTest = thread:newFunction(function()
|
||||
local alarms,tsteps,steps,loops,tloops,updaters,events=false,0,0,0,0,0,false
|
||||
multi.print("Testing Basic Features. If this fails most other features will probably not work!")
|
||||
proc:newAlarm(2):OnRing(function(a)
|
||||
alarms = true
|
||||
a:Destroy()
|
||||
end)
|
||||
proc:newTStep(1,10,1,.1):OnStep(function(t)
|
||||
tsteps = tsteps + 1
|
||||
end):OnEnd(function(step)
|
||||
step:Destroy()
|
||||
end)
|
||||
proc:newStep(1,10):OnStep(function(s)
|
||||
steps = steps + 1
|
||||
end):OnEnd(function(step)
|
||||
step:Destroy()
|
||||
end)
|
||||
local loop = proc:newLoop(function(l)
|
||||
loops = loops + 1
|
||||
end)
|
||||
proc:newTLoop(function(t)
|
||||
tloops = tloops + 1
|
||||
end,.1)
|
||||
local updater = proc:newUpdater(1):OnUpdate(function()
|
||||
updaters = updaters + 1
|
||||
end)
|
||||
local event = proc:newEvent(function()
|
||||
return alarms
|
||||
end)
|
||||
event.OnEvent(function(evnt)
|
||||
evnt:Destroy()
|
||||
events = true
|
||||
multi.success("Alarms: Ok")
|
||||
multi.success("Events: Ok")
|
||||
if tsteps == 10 then multi.success("TSteps: Ok") else multi.error("TSteps: Bad!") end
|
||||
if steps == 10 then multi.success("Steps: Ok") else multi.error("Steps: Bad!") end
|
||||
if loops > 100 then multi.success("Loops: Ok") else multi.error("Loops: Bad!") end
|
||||
if tloops > 10 then multi.success("TLoops: Ok") else multi.error("TLoops: Bad!") end
|
||||
if updaters > 100 then multi.success("Updaters: Ok") else multi.error("Updaters: Bad!") end
|
||||
end)
|
||||
thread.hold(event.OnEvent)
|
||||
multi.print("Starting Connection and Thread tests!")
|
||||
func = thread:newFunction(function(count)
|
||||
multi.print("Starting Status test: ",count)
|
||||
local a = 0
|
||||
while true do
|
||||
a = a + 1
|
||||
thread.sleep(.1)
|
||||
thread.pushStatus(a,count)
|
||||
if a == count then break end
|
||||
end
|
||||
return "Done", true, math.random(1,10000)
|
||||
end)
|
||||
local ret = func(10)
|
||||
local ret2 = func(15)
|
||||
local ret3 = func(20)
|
||||
local s1,s2,s3 = 0,0,0
|
||||
ret.OnError(function(...)
|
||||
multi.error("Func 1:",...)
|
||||
end)
|
||||
ret2.OnError(function(...)
|
||||
multi.error("Func 2:",...)
|
||||
end)
|
||||
ret3.OnError(function(...)
|
||||
multi.error("Func 3:",...)
|
||||
end)
|
||||
ret.OnStatus(function(part,whole)
|
||||
s1 = math.ceil((part/whole)*1000)/10
|
||||
end)
|
||||
ret2.OnStatus(function(part,whole)
|
||||
s2 = math.ceil((part/whole)*1000)/10
|
||||
end)
|
||||
ret3.OnStatus(function(part,whole)
|
||||
s3 = math.ceil((part/whole)*1000)/10
|
||||
end)
|
||||
|
||||
ret.OnReturn(function(...)
|
||||
multi.success("Done 1",...)
|
||||
end)
|
||||
ret2.OnReturn(function(...)
|
||||
multi.success("Done 2",...)
|
||||
end)
|
||||
ret3.OnReturn(function(...)
|
||||
multi.success("Done 3",...)
|
||||
end)
|
||||
|
||||
local err, timeout = thread.hold(ret.OnReturn * ret2.OnReturn * ret3.OnReturn)
|
||||
|
||||
if s1 == 100 and s2 == 100 and s3 == 100 then
|
||||
multi.success("Threads: All tests Ok")
|
||||
else
|
||||
if s1>0 and s2>0 and s3 > 0 then
|
||||
multi.success("Thread OnStatus: Ok")
|
||||
else
|
||||
multi.error("Threads OnStatus or thread.hold(conn) Error!")
|
||||
end
|
||||
if timeout then
|
||||
multi.error("Connection Error!")
|
||||
else
|
||||
multi.success("Connection Test 1: Ok")
|
||||
end
|
||||
multi.error("Connection holding Error!")
|
||||
end
|
||||
|
||||
conn1 = proc:newConnection()
|
||||
conn2 = proc:newConnection()
|
||||
conn3 = proc:newConnection()
|
||||
local c1,c2,c3,c4 = false,false,false,false
|
||||
|
||||
local a = conn1(function()
|
||||
c1 = true
|
||||
end)
|
||||
|
||||
local b = conn2(function()
|
||||
c2 = true
|
||||
end)
|
||||
|
||||
local c = conn3(function()
|
||||
c3 = true
|
||||
end)
|
||||
|
||||
local d = conn3(function()
|
||||
c4 = true
|
||||
end)
|
||||
|
||||
conn1:Fire()
|
||||
conn2:Fire()
|
||||
conn3:Fire()
|
||||
|
||||
if c1 and c2 and c3 and c4 then
|
||||
multi.success("Connection Test 2: Ok")
|
||||
else
|
||||
multi.error("Connection Test 2: Error")
|
||||
end
|
||||
c3 = false
|
||||
c4 = false
|
||||
conn3:Unconnect(d)
|
||||
conn3:Fire()
|
||||
if c3 and not(c4) then
|
||||
multi.success("Connection Test 3: Ok")
|
||||
else
|
||||
multi.error("Connection Test 3: Error removing connection")
|
||||
end
|
||||
if not love then
|
||||
local ec = 0
|
||||
multi.print("Testing pseudo threading")
|
||||
capture = io.popen("lua tests/threadtests.lua p"):read("*a")
|
||||
if capture:lower():match("error") then
|
||||
ec = ec + 1
|
||||
os.exit(1)
|
||||
else
|
||||
io.write(capture)
|
||||
end
|
||||
multi.print("Testing lanes threading")
|
||||
capture = io.popen("lua tests/threadtests.lua l"):read("*a")
|
||||
if capture:lower():match("error") then
|
||||
ec = ec + 1
|
||||
os.exit(1)
|
||||
else
|
||||
io.write(capture)
|
||||
end
|
||||
os.exit(0)
|
||||
end
|
||||
end)
|
||||
|
||||
local handle = runTest()
|
||||
|
||||
handle.OnError(function(...)
|
||||
multi.error("Something went wrong with the test!")
|
||||
print(...)
|
||||
end)
|
||||
|
||||
if not love then
|
||||
multi:mainloop()
|
||||
else
|
||||
local hold = thread:newFunction(function()
|
||||
thread.hold(handle.OnError + handle.OnReturn)
|
||||
end, true)
|
||||
hold()
|
||||
multi.print("Starting Threading tests!")
|
||||
end
|
||||
Reference in New Issue
Block a user