nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-12-22 17:45:28 +01:00
Code Issues Releases Wiki Activity

[Profnsched] lost jobs correction

Browse Source 
Modified to replace # when we ant to count items in an array.
Code currently not cleaned after correction.
This commit is contained in:
Coethium
2016-10-29 16:25:57 +02:00
parent 7ddebddee2
commit 8a78752659
3 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
mods/profnsched/queue.lua
View File

@@ -1,20 +1,24 @@
scheduler = {}
scheduler.queue = {[1]={first=1, last=2, groups={[1]={}, [2]={}}}}
-- scheduler.queue = {[1]={first=1, last=2, groups={[1]={}, [2]={}}}}
scheduler.queue = {[1]={cur={}, nxt={}, ncur=1, nnxt=1}}
function scheduler.add(priority, job)
-- get asked class
local class = scheduler.queue[priority]
local p = priority
while not class do -- create all classes under 'priority'
scheduler.queue[p] = {first=1, last=2, groups={[1]={}, [2]={}}}
--scheduler.queue[p] = {first=1, last=2, groups={[1]={}, [2]={}}}
scheduler.queue[p] = {cur={}, nxt={}, ncur=1, nnxt=1}
p = p-1
class = scheduler.queue[p]
end
class = scheduler.queue[priority]
class.nxt[class.nnxt] = job
class.nnxt = class.nnxt+1
-- get last group
local grp = class.groups[class.last]
--local grp = class.groups[class.last]
-- add job into last group
grp[#grp+1] = job
--grp[#grp+1] = job
end
function scheduler.asap(priority, func)
@@ -32,9 +36,27 @@ end
function scheduler.shift()
local nb = scheduler.waitingjobs()
local tsrc = nil
local tdst = nil
local qnext = nil
for class,q in ipairs(scheduler.queue) do
q.cur = q.nxt
q.nxt = {}
q.ncur = q.nnxt
q.nnxt = 1
--local tnext = class+1
qnext = scheduler.queue[class+1]
if qnext then
local src = qnext.cur
for i,j in pairs(src) do
q.cur[q.ncur] = j
q.ncur = q.ncur+1
src[i] = nil
end
qnext.cur = {}
qnext.ncur = 1
end
end
--[[
q.groups[q.first] = q.groups[q.last]
q.groups[q.last] = {}
local tnext = class+1
@@ -47,7 +69,7 @@ function scheduler.shift()
tsrc[i] = nil
end
end
end
end]]
if nb ~= scheduler.waitingjobs() then --This should never happen, left because it was used during debug phase
mdebug("ERROR, This should never happen ! Lost jobs, some mod may not work from now, please restart the server.")
end
@@ -55,28 +77,24 @@ function scheduler.shift()
end
function scheduler.fulldebug()
minetest.log("[Profnsched]"..table.getn(scheduler.queue).." classes")
minetest.log("[Profnsched]"..#scheduler.queue.." classes")
for class,q in pairs(scheduler.queue) do
minetest.log("[Profnsched] class "..class..":")
minetest.log("[Profnsched] "..q.first.." "..q.last.." ("..q.last-q.first+1 .." groups)")
for i,grp in pairs(q.groups) do
local n = 0
for j,jb in pairs(grp) do
n = n+1
end
minetest.log("[Profnsched] group "..i..", "..n.." jobs")
end
minetest.log("[Profnsched] current "..q.ncur)
minetest.log("[Profnsched] next "..q.nnxt)
end
minetest.log("[Profnsched] end")
end
function scheduler.waitingjobs()
local n = 0
for class, q in pairs(scheduler.queue) do
for i,grp in pairs(q.groups) do
for j,jb in pairs(grp) do
n = n+1
end
for i,grp in pairs(q.cur) do
n = n+1
end
for i,grp in pairs(q.nxt) do
n = n+1
end
end
return n