vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-01 00:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Optimize foreachLocalRRDHost for timeseries extraction

Browse source
This commit is contained in:
emanuele-f 2018-10-12 14:13:40 +02:00
parent 4ae5b3739b
commit 99a0cf0dd6
5 changed files with 41 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
scripts/lua/modules/callback_utils.lua
View file

@ -89,6 +89,11 @@ local function getBatchedIterator(batched_function, field, function_params)
end
end
-- A batched iterator over the local hosts with timeseries
function callback_utils.getLocalHostsTsIterator(...)
return getBatchedIterator(interface.getBatchedLocalHostsTs, "hosts", { ... })
end
-- A batched iterator over the local hosts
function callback_utils.getLocalHostsIterator(...)
return getBatchedIterator(interface.getBatchedLocalHostsInfo, "hosts", { ... })
@ -111,21 +116,21 @@ end
function callback_utils.foreachLocalRRDHost(ifname, deadline, with_ts, callback)
interface.select(ifname)
local iterator = callback_utils.getLocalHostsIterator(false --[[ no details ]])
local iterator
for hostname, hoststats in iterator do
local host_ts = nil
if with_ts then
iterator = callback_utils.getLocalHostsTsIterator()
else
iterator = callback_utils.getLocalHostsIterator(false --[[no details]])
end
for hostname, host_ts in iterator do
if(ntop.isShutdown()) then return true end
if ((deadline ~= nil) and (os.time() >= deadline)) then
-- Out of time
return false
end
if with_ts then
host_ts = interface.getHostTimeseries(hostname) or {}
end
if callback(hostname, host_ts) == false then
return false
end