diff --git a/init.lua b/init.lua index eebca03..e2af02c 100644 --- a/init.lua +++ b/init.lua @@ -67,7 +67,7 @@ setmetatable(multi.DestroyedObj, { end,__newindex = uni,__call = uni,__metatable = multi.DestroyedObj,__tostring = function() return "destroyed" end,__unm = uni,__add = uni,__sub = uni,__mul = uni,__div = uni,__mod = uni,__pow = uni,__concat = uni }) -multi.DESTROYED = multi.DestroyedObj +multi.DESTROYED = multi.DestroyedObj -- I don't like modifying the global namespace, so I prepend a "$" if not _G["$multi"] then diff --git a/integration/debugManager/init.lua b/integration/debugManager/init.lua index d397d37..da70e03 100644 --- a/integration/debugManager/init.lua +++ b/integration/debugManager/init.lua @@ -5,12 +5,15 @@ multi.defaultSettings.debugging = true local dbg = {} local creation_hook +local types creation_hook = function(obj, process) + local types = multi:getTypes() print("Created: ",obj.Type, "in", process.Type, process:getFullName()) if obj.Type == multi.PROCESS then obj.OnObjectCreated(creation_hook) end + end local debug_stats = {} @@ -19,6 +22,8 @@ local tmulti = multi:getThreadManagerProcess() multi.OnObjectCreated(creation_hook) tmulti.OnObjectCreated(creation_hook) +multi + --[[ multi.ROOTPROCESS = "rootprocess" multi.CONNECTOR = "connector" diff --git a/tests/runtests.lua b/tests/runtests.lua index 77d0c02..723f431 100644 --- a/tests/runtests.lua +++ b/tests/runtests.lua @@ -175,12 +175,24 @@ runTest = thread:newFunction(function() end if not love then local ec = 0 - multi.print("Testing pseudo threading") - ec = ec + os.execute("lua tests/threadtests.lua p") - multi.print("Testing lanes threading") - ec = ec + os.execute("lua tests/threadtests.lua l") - if ec ~= 0 then - os.exit(1) + if _VERSION > "5.1" then + multi.print("Testing pseudo threading") + _, str, ecc = os.execute("lua tests/threadtests.lua p") + ec = ec + ecc + multi.print("Testing lanes threading") + _, str, ecc = os.execute("lua tests/threadtests.lua l") + ec = ec + ecc + if ec ~= 0 then + os.exit(1) + end + else + multi.print("Testing pseudo threading") + ec = ec + os.execute("lua tests/threadtests.lua p") + multi.print("Testing lanes threading") + ec = ec + os.execute("lua tests/threadtests.lua l") + if ec ~= 0 then + os.exit(1) + end end end end)