added util timer functions, tweaks to flasher and some debug prints for #110

scada-common/tcallbackdsp.lua

@@ -13,8 +13,14 @@ local registry = {}
 ---@param time number seconds
 ---@param f function callback function
 function tcallbackdsp.dispatch(time, f)
----@diagnostic disable-next-line: undefined-field
-    registry[os.startTimer(time)] = { callback = f }
+    local timer = util.start_timer(time)
+    registry[timer] = {
+        callback = f,
+        duration = time,
+        expiry = time + util.time_s()
+    }
+
+    log.debug("queued callback for " .. util.strval(f) .. " timer #" .. timer)
 end
 
 -- request a function to be called after the specified time, aborting any registered instances of that function reference
@@ -25,25 +31,44 @@ function tcallbackdsp.dispatch_unique(time, f)
     for timer, entry in pairs(registry) do
         if entry.callback == f then
             -- found an instance of this function reference, abort it
-            log.debug(util.c("TCD: aborting duplicate timer callback (timer: ", timer, ", function: ", f, ")"))
+            log.debug(util.c("TCD: aborting duplicate timer callback (timer: ", timer, ", ", f, ")"))
 
             -- cancel event and remove from registry (even if it fires it won't call)
----@diagnostic disable-next-line: undefined-field
-            os.cancelTimer(timer)
+            util.cancel_timer(timer)
             registry[timer] = nil
         end
     end
 
----@diagnostic disable-next-line: undefined-field
-    registry[os.startTimer(time)] = { callback = f }
+    local timer = util.start_timer(time)
+    registry[timer] = {
+        callback = f,
+        duration = time,
+        expiry = time + util.time_s()
+    }
+
+    log.debug("queued callback for " .. util.strval(f) .. " timer #" .. timer)
 end
 
 -- lookup a timer event and execute the callback if found
 ---@param event integer timer event timer ID
 function tcallbackdsp.handle(event)
     if registry[event] ~= nil then
-        registry[event].callback()
+        local callback = registry[event].callback
+        -- clear first so that dispatch_unique call from inside callback won't throw a debug message
         registry[event] = nil
+        callback()
+    end
+end
+
+-- identify any overdo callbacks
+--
+-- prints to log debug output
+function tcallbackdsp.diagnostics()
+    for timer, entry in pairs(registry) do
+        if entry.expiry >= util.time_s() then
+            local overtime = util.time_s() - entry.expiry
+            log.debug(util.c("TCD: unserviced timer ", timer, " for callback ", entry.callback, " is at least ", overtime, "s late"))
+        end
     end
 end