Ryan Ward
fff3601041
* 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
298 lines
7.2 KiB
Lua
298 lines
7.2 KiB
Lua
package.path = "../?/init.lua;../?.lua;"..package.path
|
|
multi, thread = require("multi"):init{print=true,warn=true,debugging=true}
|
|
-- for i,v in pairs(thread) do
|
|
-- print(i,v)
|
|
-- end
|
|
|
|
-- require("multi.integration.priorityManager")
|
|
|
|
-- multi.debugging.OnObjectCreated(function(obj, process)
|
|
-- multi.print("Created:", obj.Type, "in", process.Type, process:getFullName())
|
|
-- end)
|
|
|
|
-- multi.debugging.OnObjectDestroyed(function(obj, process)
|
|
-- multi.print("Destroyed:", obj.Type, "in", process.Type, process:getFullName())
|
|
-- end)
|
|
|
|
|
|
-- test = multi:newProcessor("Test")
|
|
-- test:setPriorityScheme(multi.priorityScheme.TimeBased)
|
|
|
|
-- test:newUpdater(10000000):OnUpdate(function()
|
|
-- print("Print is slowish")
|
|
-- end)
|
|
|
|
-- print("Running...")
|
|
|
|
-- local conn1, conn2 = multi:newConnection(), multi:newConnection()
|
|
-- conn3 = conn1 + conn2
|
|
|
|
-- conn1(function()
|
|
-- print("Hi 1")
|
|
-- end)
|
|
|
|
-- conn2(function()
|
|
-- print("Hi 2")
|
|
-- end)
|
|
|
|
-- conn3(function()
|
|
-- print("Hi 3")
|
|
-- end)
|
|
|
|
-- function test(a,b,c)
|
|
-- print("I run before all and control if execution should continue!")
|
|
-- return a>b
|
|
-- end
|
|
|
|
-- conn4 = test .. conn1
|
|
|
|
-- conn5 = conn2 .. function() print("I run after it all!") end
|
|
|
|
-- conn4:Fire(3,2,3)
|
|
-- -- This second one won't trigger the Hi's
|
|
-- conn4:Fire(1,2,3)
|
|
|
|
-- conn5(function()
|
|
-- print("Test 1")
|
|
-- end)
|
|
|
|
-- conn5(function()
|
|
-- print("Test 2")
|
|
-- end)
|
|
|
|
-- conn5(function()
|
|
-- print("Test 3")
|
|
-- end)
|
|
|
|
-- conn5:Fire()
|
|
|
|
|
|
|
|
|
|
-- multi.print("Testing thread:newProcessor()")
|
|
|
|
-- proc = thread:newProcessor("Test")
|
|
|
|
-- proc:newLoop(function()
|
|
-- multi.print("Running...")
|
|
-- thread.sleep(1)
|
|
-- end)
|
|
|
|
-- proc:newThread(function()
|
|
-- while true do
|
|
-- multi.warn("Everything is a thread in this proc!")
|
|
-- thread.sleep(1)
|
|
-- end
|
|
-- end)
|
|
|
|
-- proc:newAlarm(5):OnRing(function(a)
|
|
-- multi.print(";) Goodbye")
|
|
-- a:Destroy()
|
|
-- end)
|
|
|
|
-- local func = thread:newFunction(function()
|
|
-- thread.sleep(4)
|
|
-- print("Hello!")
|
|
-- end)
|
|
|
|
-- multi:newTLoop(func, 1)
|
|
|
|
-- multi:mainloop()
|
|
|
|
-- multi:setTaskDelay(.05)
|
|
-- multi:newTask(function()
|
|
-- for i = 1, 10 do
|
|
-- multi:newTask(function()
|
|
-- print("Task "..i)
|
|
-- end)
|
|
-- end
|
|
-- end)
|
|
|
|
-- local conn = multi:newConnection()
|
|
-- conn(function() print("Test 1") end)
|
|
-- conn(function() print("Test 2") end)
|
|
-- conn(function() print("Test 3") end)
|
|
-- conn(function() print("Test 4") end)
|
|
|
|
-- print("Fire 1")
|
|
-- conn:Fire()
|
|
-- conn = -conn
|
|
-- print("Fire 2")
|
|
-- conn:Fire()
|
|
|
|
-- print(#conn)
|
|
|
|
-- thread:newThread("Test thread", function()
|
|
-- print("Starting thread!")
|
|
-- thread.defer(function() -- Runs when the thread finishes execution
|
|
-- print("Clean up time!")
|
|
-- end)
|
|
-- --[[
|
|
-- Do lot's of stuff
|
|
-- ]]
|
|
-- thread.sleep(3)
|
|
-- end)
|
|
|
|
multi:mainloop()
|
|
|
|
-- local conn1, conn2, conn3 = multi:newConnection(nil,nil,true), multi:newConnection(), multi:newConnection()
|
|
|
|
-- local link = conn1(function()
|
|
-- print("Conn1, first")
|
|
-- end)
|
|
|
|
-- local link2 = conn1(function()
|
|
-- print("Conn1, second")
|
|
-- end)
|
|
|
|
-- local link3 = conn1(function()
|
|
-- print("Conn1, third")
|
|
-- end)
|
|
|
|
-- local link4 = conn2(function()
|
|
-- print("Conn2, first")
|
|
-- end)
|
|
|
|
-- local link5 = conn2(function()
|
|
-- print("Conn2, second")
|
|
-- end)
|
|
|
|
-- local link6 = conn2(function()
|
|
-- print("Conn2, third")
|
|
-- end)
|
|
|
|
-- print("Links 1-6",link,link2,link3,link4,link5,link6)
|
|
-- conn1:Lock(link)
|
|
-- print("All conns\n-------------")
|
|
-- conn1:Fire()
|
|
-- conn2:Fire()
|
|
|
|
-- conn1:Unlock(link)
|
|
|
|
-- conn1:Unconnect(link3)
|
|
-- conn2:Unconnect(link6)
|
|
-- print("All conns Edit\n---------------------")
|
|
-- conn1:Fire()
|
|
-- conn2:Fire()
|
|
|
|
-- thread:newThread(function()
|
|
-- print("Awaiting status")
|
|
-- thread.hold(conn1 + (conn2 * conn3))
|
|
-- print("Conn or Conn2 and Conn3")
|
|
-- end)
|
|
|
|
-- multi:newAlarm(1):OnRing(function()
|
|
-- print("Conn")
|
|
-- conn1:Fire()
|
|
-- end)
|
|
-- multi:newAlarm(2):OnRing(function()
|
|
-- print("Conn2")
|
|
-- conn2:Fire()
|
|
-- end)
|
|
-- multi:newAlarm(3):OnRing(function()
|
|
-- print("Conn3")
|
|
-- conn3:Fire()
|
|
-- os.exit()
|
|
-- end)
|
|
|
|
|
|
-- local conn = multi:newSystemThreadedConnection("conn"):init()
|
|
|
|
-- multi:newSystemThread("Thread_Test_1", function()
|
|
-- local multi, thread = require("multi"):init()
|
|
-- local conn = GLOBAL["conn"]:init()
|
|
-- local console = THREAD.getConsole()
|
|
-- conn(function(a,b,c)
|
|
-- console.print(THREAD:getName().." was triggered!",a,b,c)
|
|
-- end)
|
|
-- multi:mainloop()
|
|
-- end)
|
|
|
|
-- multi:newSystemThread("Thread_Test_2", function()
|
|
-- local multi, thread = require("multi"):init()
|
|
-- local conn = GLOBAL["conn"]:init()
|
|
-- local console = THREAD.getConsole()
|
|
-- conn(function(a,b,c)
|
|
-- console.print(THREAD:getName().." was triggered!",a,b,c)
|
|
-- end)
|
|
-- multi:newAlarm(2):OnRing(function()
|
|
-- console.print("Fire 2!!!")
|
|
-- conn:Fire(4,5,6)
|
|
-- THREAD.kill()
|
|
-- end)
|
|
|
|
-- multi:mainloop()
|
|
-- end)
|
|
-- local console = THREAD.getConsole()
|
|
-- conn(function(a,b,c)
|
|
-- console.print("Mainloop conn got triggered!",a,b,c)
|
|
-- end)
|
|
|
|
-- alarm = multi:newAlarm(1)
|
|
-- alarm:OnRing(function()
|
|
-- console.print("Fire 1!!!")
|
|
-- conn:Fire(1,2,3)
|
|
-- end)
|
|
|
|
-- alarm = multi:newAlarm(3):OnRing(function()
|
|
-- multi:newSystemThread("Thread_Test_3",function()
|
|
-- local multi, thread = require("multi"):init()
|
|
-- local conn = GLOBAL["conn"]:init()
|
|
-- local console = THREAD.getConsole()
|
|
-- conn(function(a,b,c)
|
|
-- console.print(THREAD:getName().." was triggered!",a,b,c)
|
|
-- end)
|
|
-- multi:newAlarm(4):OnRing(function()
|
|
-- console.print("Fire 3!!!")
|
|
-- conn:Fire(7,8,9)
|
|
-- end)
|
|
-- multi:mainloop()
|
|
-- end)
|
|
-- end)
|
|
|
|
-- multi:newSystemThread("Thread_Test_4",function()
|
|
-- local multi, thread = require("multi"):init()
|
|
-- local conn = GLOBAL["conn"]:init()
|
|
-- local conn2 = multi:newConnection()
|
|
-- local console = THREAD.getConsole()
|
|
-- multi:newAlarm(2):OnRing(function()
|
|
-- conn2:Fire()
|
|
-- end)
|
|
-- multi:newThread(function()
|
|
-- console.print("Conn Test!")
|
|
-- thread.hold(conn + conn2)
|
|
-- console.print("It held!")
|
|
-- end)
|
|
-- multi:mainloop()
|
|
-- end)
|
|
|
|
-- multi:mainloop()
|
|
--[[
|
|
newFunction function: 0x00fad170
|
|
waitFor function: 0x00fad0c8
|
|
request function: 0x00fa4f10
|
|
newThread function: 0x00fad1b8
|
|
--__threads table: 0x00fa4dc8
|
|
defer function: 0x00fa4f98
|
|
isThread function: 0x00facd40
|
|
holdFor function: 0x00fa5058
|
|
yield function: 0x00faccf8
|
|
hold function: 0x00fa51a0
|
|
chain function: 0x00fa5180
|
|
__CORES 32
|
|
newISOThread function: 0x00fad250
|
|
newFunctionBase function: 0x00fad128
|
|
requests table: 0x00fa4e68
|
|
newProcessor function: 0x00fad190
|
|
exec function: 0x00fa50e8
|
|
pushStatus function: 0x00fad108
|
|
kill function: 0x00faccd8
|
|
get function: 0x00fad0a8
|
|
set function: 0x00fad088
|
|
getCores function: 0x00facd60
|
|
skip function: 0x00faccb0
|
|
--_Requests function: 0x00fa50a0
|
|
getRunningThread function: 0x00fa4fb8
|
|
holdWithin function: 0x00facc80
|
|
sleep function: 0x00fa4df0
|
|
]] |