epicknex/multi
1
0
Fork 0
mirror of https://github.com/rayaman/multi.git synced 2026-09-05 07:27:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Closer to getting things working...

Browse Source
This commit is contained in:
server
2023-08-06 00:38:22 -04:00
parent bab9b13cb8
commit a660b63581
9 changed files with 147 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration/loveManager/extensions.lua
+2
View File
@@ -70,6 +70,8 @@ function multi:newSystemThreadedTable(name)
return self
end
c.__init = c.init
function c:Hold(opt)
if opt.key then
return thread.hold(function()
integration/loveManager/threads.lua
+2 -2
View File
@@ -92,8 +92,8 @@ function INIT()
repeat
wait()
until GLOBAL[name] ~= nil
if type(GLOBAL[name].init) == "function" then
return GLOBAL[name]:init()
if type(GLOBAL[name].__init) == "function" then
return GLOBAL[name]:__init()
else
return GLOBAL[name]
end
integration/loveManagerold/threads.lua
-1
View File
@@ -48,7 +48,6 @@ end
local fRef = {"func",nil}
local function manage(channel, value)
channel:clear()
print("pushing",value)
if type(value) == "table" then
channel:push{"DATA",threads.packTable(value)}
else
integration/lovrManager/init.lua
+2 -2
View File
@@ -87,12 +87,12 @@ function multi:newSystemThread(name,func,...)
end
THREAD.newSystemThread = multi.newSystemThread
function lovr.threaderror(thread, errorstr)
print("Thread error!\n"..errorstr)
multi.print("Thread error!\n"..errorstr)
end
multi.integration.GLOBAL = GLOBAL
multi.integration.THREAD = THREAD
require("multi.integration.lovrManager.extensions")
print("Integrated lovr Threading!")
multi.print("Integrated lovr Threading!")
return {init=function()
return GLOBAL,THREAD
end}
integration/pseudoManager/extensions.lua
+130 -56
View File
@@ -47,6 +47,17 @@ function multi:newSystemThreadedQueue(name)
function c:init()
return self
end
function c:Hold(opt)
if opt.peek then
return thread.hold(function()
return self:peek()
end)
else
return thread.hold(function()
return self:pop()
end)
end
end
GLOBAL[name or "_"] = c
return c
end
@@ -56,58 +67,59 @@ function multi:newSystemThreadedTable(name)
function c:init()
return self
end
function c:Hold(opt)
if opt.key then
return thread.hold(function()
return self.tab[opt.key]
end)
else
multi.error("Must provide a key to check opt.key = 'key'")
end
end
GLOBAL[name or "_"] = c
return c
end
local setfenv = setfenv
if not setfenv then
if not debug then
multi.print("Unable to implement setfenv in lua 5.2+ the debug module is not available!")
else
setfenv = function(f, env)
return load(string.dump(f), nil, nil, env)
end
end
end
local setfenv = multi.isolateFunction
local jqc = 1
function multi:newSystemThreadedJobQueue(n)
local c = {}
c.cores = n or THREAD.getCores()*2
c.OnJobCompleted = multi:newConnection()
local jobs = {}
local ID=1
local jid = 1
local env = {}
local c = {}
setmetatable(env,{
__index = _G
})
c.cores = n or THREAD.getCores()
c.registerQueue = {}
c.Type = multi.SJOBQUEUE
c.funcs = multi:newSystemThreadedTable("__JobQueue_"..jqc.."_table")
c.queue = multi:newSystemThreadedQueue("__JobQueue_"..jqc.."_queue")
c.queueReturn = multi:newSystemThreadedQueue("__JobQueue_"..jqc.."_queueReturn")
c.queueAll = multi:newSystemThreadedQueue("__JobQueue_"..jqc.."_queueAll")
c.id = 0
c.OnJobCompleted = multi:newConnection()
local funcs = {}
function c:doToAll(func)
setfenv(func,env)()
return self
local allfunc = 0
function c:doToAll(func)
for i = 1, self.cores do
self.queueAll:push({allfunc, func})
end
allfunc = allfunc + 1
end
function c:registerFunction(name, func)
if self.funcs[name] then
multi.error("A function by the name "..name.." has already been registered!")
end
self.funcs[name] = func
end
function c:pushJob(name,...)
self.id = self.id + 1
self.queue:push{name,self.id,...}
return self.id
end
function c:isEmpty()
return queueJob:peek()==nil
end
function c:registerFunction(name,func)
funcs[name] = setfenv(func,env)
return self
end
function c:pushJob(name,...)
table.insert(jobs,{name,jid,multi.pack(...)})
jid = jid + 1
return jid-1
end
function c:isEmpty()
return #jobs == 0
end
local nFunc = 0
local nFunc = 0
function c:newFunction(name,func,holup) -- This registers with the queue
local func = stripUpValues(func)
if type(name)=="function" then
holup = func
func = name
@@ -129,22 +141,84 @@ function multi:newSystemThreadedJobQueue(n)
return multi.unpack(rets) or multi.NIL
end
end)
end, holup), name
end,holup),name
end
for i=1,c.cores do
thread:newThread("PesudoThreadedJobQueue_"..i,function()
while true do
thread.yield()
if #jobs>0 then
local j = table.remove(jobs,1)
c.OnJobCompleted:Fire(j[2],funcs[j[1]](multi.unpack(j[3])))
else
thread.sleep(.05)
end
end
end).OnError(multi.error)
thread:newThread("jobManager",function()
while true do
thread.yield()
local dat = c.queueReturn:pop()
if dat then
c.OnJobCompleted:Fire(multi.unpack(dat))
end
end
end)
for i=1,c.cores do
multi:newSystemThread("JobQueue_"..jqc.."_worker_"..i,function(jqc)
local multi, thread = require("multi"):init()
local clock = os.clock
local funcs = THREAD.waitFor("__JobQueue_"..jqc.."_table")
local queue = THREAD.waitFor("__JobQueue_"..jqc.."_queue")
local queueReturn = THREAD.waitFor("__JobQueue_"..jqc.."_queueReturn")
local lastProc = clock()
local queueAll = THREAD.waitFor("__JobQueue_"..jqc.."_queueAll")
local registry = {}
_G["__QR"] = queueReturn
setmetatable(_G,{__index = funcs})
thread:newThread("startUp",function()
while true do
thread.yield()
local all = queueAll:peek()
if all and not registry[all[1]] then
lastProc = os.clock()
queueAll:pop()[2]()
end
end
end)
thread:newThread("runner",function()
thread.sleep(.1)
while true do
thread.yield()
local all = queueAll:peek()
if all and not registry[all[1]] then
lastProc = os.clock()
queueAll:pop()[2]()
end
local dat = thread.hold(queue)
if dat then
multi:newThread("Test",function()
lastProc = os.clock()
local name = table.remove(dat,1)
local id = table.remove(dat,1)
local tab = {multi.isolateFunction(funcs[name],_G)(multi.unpack(dat))}
table.insert(tab,1,id)
queueReturn:push(tab)
end)
end
end
end).OnError(multi.error)
thread:newThread("Idler",function()
while true do
thread.yield()
if clock()-lastProc> 2 then
THREAD.sleep(.05)
else
THREAD.sleep(.001)
end
end
end)
multi:mainloop()
end,jqc)
end
function c:Hold(opt)
return thread.hold(self.OnJobCompleted)
end
return c
jqc = jqc + 1
self:create(c)
return c
end
function multi:newSystemThreadedConnection(name)
integration/sharedExtensions/init.lua
+2 -2
View File
@@ -189,7 +189,6 @@ function multi:newProxy(list)
THREAD = multi.integration.THREAD
end
local proxy = THREAD.waitFor(self.proxy_link)
print("Got:",proxy)
proxy.funcs = self.funcs
return proxy:init()
end
@@ -267,7 +266,8 @@ function multi:newSystemThreadedProcessor(cores)
for _, method in pairs(implement) do
c[method] = function(self, ...)
proxy = self.spawnTask(method, ...):init()
proxy = self.spawnTask(method, ...)
proxy:init()
references[proxy] = self
return proxy
end