lib: Make the debug callbacks a list of callbacks

Allow multiple callers to initialize themselves to receive
callbacks for debug on/off operations.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/lib/debug.c b/lib/debug.c
index 72fd4648ee85ae97962ca288717c43d0b7cbc6c9..a39623b03981d425d70010234534dbb213751e77 100644 (file)
--- a/lib/debug.c
+++ b/lib/debug.c
@@ -18,29 +18,43 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <zebra.h>
+#include "typesafe.h"
 #include "debug.h"
 #include "command.h"
 
-static const struct debug_callbacks *callbacks;
+static struct debug_cb_list_head cb_head;
+
+DECLARE_LIST(debug_cb_list, struct debug_callbacks, item)
 
 /* All code in this section should be reentrant and MT-safe */
 
 DEFUN_NOSH(debug_all, debug_all_cmd, "[no] debug all",
           NO_STR DEBUG_STR "Toggle all debugging output\n")
 {
+       struct debug_callbacks *cb;
+
        bool set = !strmatch(argv[0]->text, "no");
        uint32_t mode = DEBUG_NODE2MODE(vty->node);
 
-       if (callbacks->debug_set_all)
-               callbacks->debug_set_all(mode, set);
+       frr_each (debug_cb_list, &cb_head, cb)
+               cb->debug_set_all(mode, set);
+
        return CMD_SUCCESS;
 }
 
 /* ------------------------------------------------------------------------- */
 
-void debug_init(const struct debug_callbacks *cb)
+void debug_init(struct debug_callbacks *cb)
 {
-       callbacks = cb;
+       static bool inited = false;
+
+       if (!inited) {
+               inited = true;
+               debug_cb_list_init(&cb_head);
+       }
+
+       debug_cb_list_add_head(&cb_head, cb);
+
        install_element(ENABLE_NODE, &debug_all_cmd);
        install_element(CONFIG_NODE, &debug_all_cmd);
 }

diff --git a/lib/debug.h b/lib/debug.h
index ace060d0578905fb64a0734da41a63b673c42a45..0ee5963ec6b8a2f5d759ab93ee16ad21e8850e88 100644 (file)
--- a/lib/debug.h
+++ b/lib/debug.h
@@ -84,6 +84,7 @@ struct debug {
        const char *desc;
 };
 
+PREDECL_LIST(debug_cb_list)
 /*
  * Callback set for debugging code.
  *
@@ -92,6 +93,11 @@ struct debug {
  *    mode set.
  */
 struct debug_callbacks {
+       /*
+        * Linked list of Callbacks to call
+        */
+       struct debug_cb_list_item item;
+
        /*
         * flags
         *    flags to set on debug flag fields
@@ -233,7 +239,7 @@ struct debug_callbacks {
  *
  * MT-Safe
  */
-void debug_init(const struct debug_callbacks *cb);
+void debug_init(struct debug_callbacks *cb);
 
 #ifdef __cplusplus
 }