Use structure size and version for event description extensibility

[libside.git] / src / tracer.c

diff --git a/src/tracer.c b/src/tracer.c
index 486dc1968a6a5b39c64c0a27255e6ffb8b73d860..dc902aaac2523cdae19a3ce48af917823214a014 100644 (file)
--- a/src/tracer.c
+++ b/src/tracer.c
@@ -1517,12 +1517,14 @@ void tracer_print_vla_visitor(const struct side_type *type_desc, void *app_ctx)
                .write_elem = tracer_write_elem_cb,
                .priv = &tracer_priv,
        };
+       side_visitor_func func;
 
        print_attributes("attr", ":", side_ptr_get(type_desc->u.side_vla_visitor.attr), type_desc->u.side_vla_visitor.nr_attr);
        printf("%s", type_desc->u.side_vla_visitor.nr_attr ? ", " : "");
        printf("elements: ");
        printf("[ ");
-       status = type_desc->u.side_vla_visitor.visitor(&tracer_ctx, app_ctx);
+       func = side_ptr_get(type_desc->u.side_vla_visitor.visitor);
+       status = func(&tracer_ctx, app_ctx);
        switch (status) {
        case SIDE_VISITOR_STATUS_OK:
                break;
@@ -1580,13 +1582,13 @@ void tracer_print_dynamic_struct_visitor(const struct side_arg *item)
                .write_field = tracer_dynamic_struct_write_elem_cb,
                .priv = &tracer_priv,
        };
-       void *app_ctx = item->u.side_dynamic.side_dynamic_struct_visitor.app_ctx;
+       void *app_ctx = side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor.app_ctx);
 
        print_attributes("attr", "::", side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor.attr), item->u.side_dynamic.side_dynamic_struct_visitor.nr_attr);
        printf("%s", item->u.side_dynamic.side_dynamic_struct_visitor.nr_attr ? ", " : "");
        printf("fields:: ");
        printf("[ ");
-       status = item->u.side_dynamic.side_dynamic_struct_visitor.visitor(&tracer_ctx, app_ctx);
+       status = side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor.visitor)(&tracer_ctx, app_ctx);
        switch (status) {
        case SIDE_VISITOR_STATUS_OK:
                break;
@@ -1642,13 +1644,13 @@ void tracer_print_dynamic_vla_visitor(const struct side_arg *item)
                .write_elem = tracer_dynamic_vla_write_elem_cb,
                .priv = &tracer_priv,
        };
-       void *app_ctx = item->u.side_dynamic.side_dynamic_vla_visitor.app_ctx;
+       void *app_ctx = side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor.app_ctx);
 
        print_attributes("attr", "::", side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor.attr), item->u.side_dynamic.side_dynamic_vla_visitor.nr_attr);
        printf("%s", item->u.side_dynamic.side_dynamic_vla_visitor.nr_attr ? ", " : "");
        printf("elements:: ");
        printf("[ ");
-       status = item->u.side_dynamic.side_dynamic_vla_visitor.visitor(&tracer_ctx, app_ctx);
+       status = side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor.visitor)(&tracer_ctx, app_ctx);
        switch (status) {
        case SIDE_VISITOR_STATUS_OK:
                break;
@@ -1795,9 +1797,28 @@ void tracer_event_notification(enum side_tracer_notification notif,
                /* Skip NULL pointers */
                if (!event)
                        continue;
+               if (event->version != SIDE_ABI_VERSION) {
+                       printf("Error: event SIDE ABI version (%u) does not match the SIDE ABI version supported by the tracer (%u)\n",
+                               event->version, SIDE_ABI_VERSION);
+                               return;
+               }
                printf("provider: %s, event: %s\n",
                        side_ptr_get(event->provider_name), side_ptr_get(event->event_name));
+               if (event->struct_size != side_offsetofend(struct side_event_description, side_event_description_orig_abi_last)) {
+                       printf("Warning: Event %s.%s contains fields unknown to the tracer\n",
+                               side_ptr_get(event->provider_name), side_ptr_get(event->event_name));
+               }
                if (notif == SIDE_TRACER_NOTIFICATION_INSERT_EVENTS) {
+                       if (event->nr_side_type_label > _NR_SIDE_TYPE_LABEL) {
+                               printf("Warning: event %s:%s may contain unknown field types (%u unknown types)\n",
+                                       side_ptr_get(event->provider_name), side_ptr_get(event->event_name),
+                                       event->nr_side_type_label - _NR_SIDE_TYPE_LABEL);
+                       }
+                       if (event->nr_side_attr_type > _NR_SIDE_ATTR_TYPE) {
+                               printf("Warning: event %s:%s may contain unknown attribute types (%u unknown types)\n",
+                                       side_ptr_get(event->provider_name), side_ptr_get(event->event_name),
+                                       event->nr_side_attr_type - _NR_SIDE_ATTR_TYPE);
+                       }
                        if (event->flags & SIDE_EVENT_FLAG_VARIADIC) {
                                ret = side_tracer_callback_variadic_register(event, tracer_call_variadic, NULL);
                                if (ret)