Change "handler" terminology to the more specific listener

[babeltrace.git] / formats / ctf / ir / trace.c

diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c
index c4889b79b44fb2f4ef318f387434bfad800ca79f..2b3fb0e65e580851e4cf690438ac8b07d54ee8d9 100644 (file)
--- a/formats/ctf/ir/trace.c
+++ b/formats/ctf/ir/trace.c
@@ -37,7 +37,9 @@
 #include <babeltrace/ctf-ir/field-types-internal.h>
 #include <babeltrace/ctf-ir/attributes-internal.h>
 #include <babeltrace/ctf-ir/validation-internal.h>
+#include <babeltrace/ctf-ir/visitor-internal.h>
 #include <babeltrace/ctf-ir/utils.h>
+#include <babeltrace/plugin/notification/schema.h>
 #include <babeltrace/compiler.h>
 #include <babeltrace/values.h>
 #include <babeltrace/ref.h>
@@ -46,8 +48,8 @@
 #define DEFAULT_IDENTIFIER_SIZE 128
 #define DEFAULT_METADATA_STRING_SIZE 4096
 
-struct notification_handler {
-       bt_ctf_notification_cb func;
+struct listener_wrapper {
+       bt_ctf_listener_cb listener;
        void *data;
 };
 
@@ -1032,24 +1034,100 @@ end:
        return ret;
 }
 
-int bt_ctf_trace_add_notification_handler_cb(struct bt_ctf_trace *trace,
-               bt_ctf_notification_cb handler, void *handler_data)
+static
+int get_stream_class_count(void *element)
+{
+       return bt_ctf_trace_get_stream_class_count(
+                       (struct bt_ctf_trace *) element);
+}
+
+static
+void *get_stream_class(void *element, int i)
+{
+       return bt_ctf_trace_get_stream_class(
+                       (struct bt_ctf_trace *) element, i);
+}
+
+static
+int visit_stream_class(void *element, bt_ctf_ir_visitor visitor,void *data)
+{
+       return bt_ctf_stream_class_visit(element, visitor, data);
+}
+
+int bt_ctf_trace_visit(struct bt_ctf_trace *trace,
+               bt_ctf_ir_visitor visitor, void *data)
+{
+       int ret;
+       struct bt_ctf_ir_element element =
+                       { .element = trace, .type = BT_CTF_IR_TYPE_TRACE };
+
+       if (!trace || !visitor) {
+               ret = -1;
+               goto end;
+       }
+
+       ret = visitor_helper(&element, get_stream_class_count,
+                       get_stream_class, visit_stream_class, visitor, data);
+end:
+       return ret;
+}
+
+static
+int ir_visitor(struct bt_ctf_ir_element *element, void *data)
 {
        int ret = 0;
-       struct notification_handler *handler_wrapper =
-                       g_new0(struct notification_handler, 1);
 
-       if (!trace || !handler || !handler_wrapper) {
+       switch (element->type) {
+       case BT_CTF_IR_TYPE_TRACE:
+       {
+               break;
+       }
+       case BT_CTF_IR_TYPE_STREAM_CLASS:
+       {
+               break;
+       }
+       case BT_CTF_IR_TYPE_EVENT_CLASS:
+       {
+               break;
+       }
+       default:
+               assert(0);
+               ret = -1;
+               goto end;
+       }
+end:
+       return ret;
+}
+
+int bt_ctf_trace_add_listener(struct bt_ctf_trace *trace,
+               bt_ctf_listener_cb listener, void *listener_data)
+{
+       int ret = 0;
+       struct listener_wrapper *listener_wrapper =
+                       g_new0(struct listener_wrapper, 1);
+
+       if (!trace || !listener || !listener_wrapper) {
                ret = -1;
                goto error;
        }
 
-       handler_wrapper->func = handler;
-       handler_wrapper->data = handler_data;
-       g_ptr_array_add(trace->notification_handlers, handler_wrapper);
+       listener_wrapper->listener = listener;
+       listener_wrapper->data = listener_data;
+
+       /* Visit the current schema. */
+       ret = bt_ctf_trace_visit(trace, ir_visitor, listener_wrapper);
+       if (ret) {
+               goto error;
+       }
+
+       /*
+        * Add listener to the array of callbacks which will be invoked on
+        * schema changes.
+        */
+       g_ptr_array_add(trace->listeners, listener_wrapper);
        return ret;
 error:
-       g_free(handler_wrapper);
+       g_free(listener_wrapper);
        return ret;
 }