Merge branch 'snabbflow-timeline-2023' into max-next

src/core/app.lua

@@ -46,7 +46,6 @@ function timeline ()
       timeline_log = timeline_mod.new("events.timeline")
       timeline_mod.rate(timeline_log, 9) -- initially log events with rate >= 9
       events = timeline_mod.load_events(timeline_log, "core.engine")
-      packet.initialize_events()
    end
    return timeline_log
 end
@@ -268,8 +267,6 @@ end
 
 -- Return the configuration actions needed to migrate from old config to new.
 function compute_config_actions (old, new)
-   timeline() -- Ensure timeline is created and initialized
-
    local actions = {}
 
    -- First determine the links that are going away and remove them.
@@ -336,8 +333,6 @@ end
 
 -- Update the active app network by applying the necessary actions.
 function apply_config_actions (actions)
-   timeline() -- Ensure timeline is created and initialized
-
    -- Table of functions that execute config actions
    local ops = {}
    -- As an efficiency hack, some apps rely on the fact that we add

src/core/packet.lua

@@ -116,9 +116,7 @@ function initialize (max_packets)
       shm.unlink("engine/packets.freelist")
    end
    packets_fl = freelist_create("engine/packets.freelist", max_packets)
-end
-
-function initialize_events ()
+
    if not events then
       events = timeline.load_events(engine.timeline(), "core.packet")
    end

src/lib/ptree/worker.lua

@@ -15,7 +15,7 @@ local channel      = require("lib.ptree.channel")
 local action_codec = require("lib.ptree.action_codec")
 local ptree_alarms = require("lib.ptree.alarms")
 local timeline     = require("core.timeline")
-local events
+local events       = timeline.load_events(engine.timeline(), "core.engine")
 
 local Worker = {}
 
@@ -105,9 +105,7 @@ function Worker:main ()
 
    if not engine.auditlog_enabled then engine.enable_auditlog() end
 
-   if not events then 
-      events = timeline.load_events(engine.timeline(), "core.engine")
-   end
+   engine.timeline()
 
    engine.enable_tick()
 

src/program/ipfix/probe/probe.lua

@@ -23,10 +23,9 @@ local long_opts = {
    busywait ="b",
    ["real-time"] = "r",
    ["no-profile"] = "p",
-   ["timeline"] = "t",
    ["test-pcap"] = "T"
 }
-local opt = "hn:brptT:"
+local opt = "hn:brpT:"
 local opt_handler = {}
 local name
 local busywait, real_time, profile = false, false, true
@@ -35,8 +34,6 @@ function opt_handler.n (arg) name = arg end
 function opt_handler.b () busywait = true end
 function opt_handler.r () real_time = true end
 function opt_handler.p () profile = false end
-local timeline = false
-function opt_handler.t () timeline = true end
 local pcap_input
 function opt_handler.T (arg) pcap_input = arg end
 
@@ -100,7 +97,6 @@ function start (name, confpath)
          busywait = busywait,
          real_time = real_time,
          profile = profile,
-         timeline = timeline,
          group_freelist_size = update_group_freelist_size(
             conf.snabbflow_config.rss.software_scaling.group_freelist_size
          ),