local jobs = {}
local time = 0.0
-local last = core.get_us_time() / 1000000
+local time_next = math.huge
core.register_globalstep(function(dtime)
- local new = core.get_us_time() / 1000000
- if new > last then
- time = time + (new - last)
- else
- -- Overflow, we may lose a little bit of time here but
- -- only 1 tick max, potentially running timers slightly
- -- too early.
- time = time + new
- end
- last = new
+ time = time + dtime
- if #jobs < 1 then
+ if time < time_next then
return
end
+ time_next = math.huge
+
-- Iterate backwards so that we miss any new timers added by
- -- a timer callback, and so that we don't skip the next timer
- -- in the list if we remove one.
+ -- a timer callback.
for i = #jobs, 1, -1 do
local job = jobs[i]
if time >= job.expire then
core.set_last_run_mod(job.mod_origin)
job.func(unpack(job.arg))
- table.remove(jobs, i)
+ local jobs_l = #jobs
+ jobs[i] = jobs[jobs_l]
+ jobs[jobs_l] = nil
+ elseif job.expire < time_next then
+ time_next = job.expire
end
end
end)
function core.after(after, func, ...)
assert(tonumber(after) and type(func) == "function",
- "Invalid core.after invocation")
+ "Invalid minetest.after invocation")
+ local expire = time + after
jobs[#jobs + 1] = {
func = func,
- expire = time + after,
+ expire = expire,
arg = {...},
mod_origin = core.get_last_run_mod()
}
+ time_next = math.min(time_next, expire)
end