From 491e1aec476f2ecd825f71e3c23fa179605ed76d Mon Sep 17 00:00:00 2001 From: Ryan Ward Date: Fri, 7 Feb 2025 11:24:42 -0500 Subject: [PATCH] cleaning up --- init.lua | 3 +- tests/test.lua | 298 ------------------------------------------------- 2 files changed, 2 insertions(+), 299 deletions(-) delete mode 100644 tests/test.lua diff --git a/init.lua b/init.lua index 6c6c432..d23e527 100644 --- a/init.lua +++ b/init.lua @@ -92,7 +92,7 @@ function multi.getTypes() return types end -multi.Version = "16.0.1" +multi.Version = "16.1.0" multi.Name = "root" multi.NIL = {Type="NIL"} local NIL = multi.NIL @@ -213,6 +213,7 @@ end local optimization_stats = {} local ignoreconn = true local empty_func = function() end + function multi:newConnection(protect,func,kill) local processor = self local c={} diff --git a/tests/test.lua b/tests/test.lua deleted file mode 100644 index d5056db..0000000 --- a/tests/test.lua +++ /dev/null @@ -1,298 +0,0 @@ -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 -]] \ No newline at end of file