Fix: CTF 1.8 mandates that event "fields" must be a structure

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index 2c1dad47500b1480569369ab581d776bb9933ee1..e51087ba14a05528494ed674f1d00dfa7fa4c8b6 100644 (file)
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -158,7 +158,8 @@ int bt_ctf_event_class_set_payload_type(struct bt_ctf_event_class *event_class,
 {
        int ret = 0;
 
-       if (!event_class || !payload) {
+       if (!event_class || !payload ||
+               bt_ctf_field_type_get_type_id(payload) != CTF_TYPE_STRUCT) {
                ret = -1;
                goto end;
        }

diff --git a/include/babeltrace/ctf-ir/event.h b/include/babeltrace/ctf-ir/event.h
index 83aa044a908e32a744899a84008f6f775d15aa0d..102883d63066366befcd66815dfb33f7b3b6fc65 100644 (file)
--- a/include/babeltrace/ctf-ir/event.h
+++ b/include/babeltrace/ctf-ir/event.h
@@ -120,7 +120,7 @@ extern struct bt_ctf_field_type *bt_ctf_event_class_get_payload_type(
  * Set an event class' payload type.
  *
  * @param event_class Event class.
- * @param payload The payload's type.
+ * @param payload The payload's type (must be a structure).
  *
  * Returns 0 on success, a negative value on error.
  */