lib: hooks: support priority ordering & reversing

Allow registering callbacks with a priority value used to order them
relative to each other.  Plus a reverse variant that just flips the
direction on priorities.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/lib/hook.c b/lib/hook.c
index 2c877cbf451e64402644088c26ee58268e4b213c..1468c4d3291f15ca00769d0eaab2eb7fb6a6ee91 100644 (file)
--- a/lib/hook.c
+++ b/lib/hook.c
@@ -26,17 +26,25 @@
 DEFINE_MTYPE_STATIC(LIB, HOOK_ENTRY, "Hook entry")
 
 void _hook_register(struct hook *hook, void *funcptr, void *arg, bool has_arg,
-                   struct frrmod_runtime *module, const char *funcname)
+                   struct frrmod_runtime *module, const char *funcname,
+                   int priority)
 {
-       struct hookent *he = XCALLOC(MTYPE_HOOK_ENTRY, sizeof(*he));
+       struct hookent *he = XCALLOC(MTYPE_HOOK_ENTRY, sizeof(*he)), **pos;
        he->hookfn = funcptr;
        he->hookarg = arg;
        he->has_arg = has_arg;
        he->module = module;
        he->fnname = funcname;
+       he->priority = priority;
 
-       he->next = hook->entries;
-       hook->entries = he;
+       for (pos = &hook->entries; *pos; pos = &(*pos)->next)
+               if (hook->reverse
+                   ? (*pos)->priority < priority
+                   : (*pos)->priority >= priority)
+                       break;
+
+       he->next = *pos;
+       *pos = he;
 }
 
 void _hook_unregister(struct hook *hook, void *funcptr, void *arg, bool has_arg)

diff --git a/lib/hook.h b/lib/hook.h
index 4a5cee2fd394ea1783cfc0c5f33c6869101ba2e9..5f45e113e75cbca264159b7d023c3d51735190e3 100644 (file)
--- a/lib/hook.h
+++ b/lib/hook.h
@@ -74,6 +74,29 @@
  *     hook_register_arg (some_update_event, event_handler, addonptr);
  *
  *   (addonptr isn't typesafe, but that should be manageable.)
+ *
+ * Hooks also support a "priority" value for ordering registered calls
+ * relative to each other.  The priority is a signed integer where lower
+ * values are called earlier.  There is also "Koohs", which is hooks with
+ * reverse priority ordering (for cleanup/deinit hooks, so you can use the
+ * same priority value).
+ *
+ * Recommended priority value ranges are:
+ *
+ *  -999 ...     0 ...  999 - main executable / daemon, or library
+ * -1999 ... -1000          - modules registering calls that should run before
+ *                            the daemon's bits
+ *            1000 ... 1999 - modules calls that should run after daemon's
+ *
+ * Note: the default value is 1000, based on the following 2 expectations:
+ * - most hook_register() usage will be in loadable modules
+ * - usage of hook_register() in the daemon itself may need relative ordering
+ *   to itself, making an explicit value the expected case
+ *
+ * The priority value is passed as extra argument on hook_register_prio() /
+ * hook_register_arg_prio().  Whether a hook runs in reverse is determined
+ * solely by the code defining / calling the hook.  (DECLARE_KOOH is actually
+ * the same thing as DECLARE_HOOK, it's just there to make it obvious.)
  */
 
 /* TODO:
@@ -94,6 +117,7 @@ struct hookent {
        void *hookfn; /* actually a function pointer */
        void *hookarg;
        bool has_arg;
+       int priority;
        struct frrmod_runtime *module;
        const char *fnname;
 };
@@ -101,8 +125,11 @@ struct hookent {
 struct hook {
        const char *name;
        struct hookent *entries;
+       bool reverse;
 };
 
+#define HOOK_DEFAULT_PRIORITY 1000
+
 /* subscribe/add callback function to a hook
  *
  * always use hook_register(), which uses the static inline helper from
@@ -110,14 +137,21 @@ struct hook {
  */
 extern void _hook_register(struct hook *hook, void *funcptr, void *arg,
                           bool has_arg, struct frrmod_runtime *module,
-                          const char *funcname);
+                          const char *funcname, int priority);
 #define hook_register(hookname, func)                                          \
        _hook_register(&_hook_##hookname, _hook_typecheck_##hookname(func),    \
-                      NULL, false, THIS_MODULE, #func)
+                      NULL, false, THIS_MODULE, #func, HOOK_DEFAULT_PRIORITY)
 #define hook_register_arg(hookname, func, arg)                                 \
        _hook_register(&_hook_##hookname,                                      \
                       _hook_typecheck_arg_##hookname(func), arg, true,        \
-                      THIS_MODULE, #func)
+                      THIS_MODULE, #func, HOOK_DEFAULT_PRIORITY)
+#define hook_register_prio(hookname, prio, func)                               \
+       _hook_register(&_hook_##hookname, _hook_typecheck_##hookname(func),    \
+                      NULL, false, THIS_MODULE, #func, prio)
+#define hook_register_arg_prio(hookname, prio, func, arg)                      \
+       _hook_register(&_hook_##hookname,                                      \
+                      _hook_typecheck_arg_##hookname(func),                   \
+                      arg, true, THIS_MODULE, #func, prio)
 
 extern void _hook_unregister(struct hook *hook, void *funcptr, void *arg,
                             bool has_arg);
@@ -156,12 +190,14 @@ extern void _hook_unregister(struct hook *hook, void *funcptr, void *arg,
        {                                                                      \
                return (void *)funcptr;                                        \
        }
+#define DECLARE_KOOH(hookname, arglist, passlist) \
+       DECLARE_HOOK(hookname, arglist, passlist)
 
 /* use in source file - contains hook-related definitions.
  */
-#define DEFINE_HOOK(hookname, arglist, passlist)                               \
+#define DEFINE_HOOK_INT(hookname, arglist, passlist, rev)                      \
        struct hook _hook_##hookname = {                                       \
-               .name = #hookname, .entries = NULL,                            \
+               .name = #hookname, .entries = NULL, .reverse = rev,            \
        };                                                                     \
        static int hook_call_##hookname arglist                                \
        {                                                                      \
@@ -184,4 +220,9 @@ extern void _hook_unregister(struct hook *hook, void *funcptr, void *arg,
                return hooksum;                                                \
        }
 
+#define DEFINE_HOOK(hookname, arglist, passlist) \
+       DEFINE_HOOK_INT(hookname, arglist, passlist, false)
+#define DEFINE_KOOH(hookname, arglist, passlist) \
+       DEFINE_HOOK_INT(hookname, arglist, passlist, true)
+
 #endif /* _FRR_HOOK_H */