Rework am_ao_dump_event_queues() and am_ao_dump_event_queues()

Author: adel-mamin

libs/ao/ao.c

@@ -28,6 +28,7 @@
  * Active Object (AO) API implementation.
  */
 
+#include <limits.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -306,10 +307,18 @@ void am_ao_init_subscribe_list(struct am_ao_subscribe_list *sub, int nsub) {
 }
 
 void am_ao_dump_event_queues(
-    int num, void (*log)(const char *name, int i, int len, int cap, int event)
+    int num,
+    void (*log)(
+        const char *name, int i, int len, int cap, const struct am_event *event
+    )
 ) {
+    AM_ASSERT(num != 0);
     AM_ASSERT(log);
 
+    if (num < 0) {
+        num = INT_MAX;
+    }
+
     struct am_ao_state *me = &g_am_ao_state;
     for (int i = 0; i < AM_COUNTOF(me->ao); i++) {
         struct am_ao *ao = me->ao[i];
@@ -318,21 +327,18 @@ void am_ao_dump_event_queues(
         }
         struct am_queue *q = &ao->event_queue;
         int cap = am_queue_capacity(q);
-        me->crit_enter();
         int len = am_queue_length(q);
         int tnum = AM_MIN(num, len);
         if (0 == tnum) {
-            me->crit_exit();
             log(ao->name, 0, len, cap, /*event=*/AM_EVT_INVALID);
             continue;
         }
         for (int j = 0; j < tnum; j++) {
             struct am_event **e = (struct am_event **)am_queue_pop_front(q);
             AM_ASSERT(e);
             AM_ASSERT(*e);
-            log(ao->name, j, len, cap, (*e)->id);
+            log(ao->name, j, len, cap, *e);
         }
-        me->crit_exit();
     }
 }
 

libs/ao/ao.h

@@ -285,11 +285,14 @@ bool am_ao_run_all(bool loop);
 /**
  * Log the content of the first num events in each event queue of every AO.
  *
- * @param num  the number of events to log
+ * @param num  the number of events to log. Use -1 to log all events.
  * @param log  the logging callback
  */
 void am_ao_dump_event_queues(
-    int num, void (*log)(const char *name, int i, int len, int cap, int event)
+    int num,
+    void (*log)(
+        const char *name, int i, int len, int cap, const struct am_event *event
+    )
 );
 
 /**