lib/ctf-ir/event-class.c: add logging
authorPhilippe Proulx <eeppeliteloop@gmail.com>
Sun, 14 May 2017 03:01:09 +0000 (23:01 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Sun, 28 May 2017 16:57:43 +0000 (12:57 -0400)
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
lib/ctf-ir/event-class.c

index 49cca8c6ccc5a64a2b3dca8e257693a60164c2f2..5be7e7adae1591e694dadbaf3fe914641ee2349b 100644 (file)
@@ -26,6 +26,9 @@
  * SOFTWARE.
  */
 
+#define BT_LOG_TAG "EVENT-CLASS"
+#include <babeltrace/lib-logging-internal.h>
+
 #include <babeltrace/ctf-ir/fields-internal.h>
 #include <babeltrace/ctf-ir/field-types-internal.h>
 #include <babeltrace/ctf-ir/event-class.h>
@@ -40,6 +43,7 @@
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/endian-internal.h>
 #include <babeltrace/types.h>
+#include <babeltrace/values-internal.h>
 #include <inttypes.h>
 
 static
@@ -51,12 +55,18 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
        struct bt_value *obj = NULL;
        struct bt_ctf_event_class *event_class = NULL;
 
+       BT_LOGD("Creating event class object: name=\"%s\"",
+               name);
+
        if (bt_ctf_validate_identifier(name)) {
+               BT_LOGW("Invalid parameter: event class's name is not a valid CTF identifier: "
+                       "name=\"%s\"", name);
                goto error;
        }
 
        event_class = g_new0(struct bt_ctf_event_class, 1);
        if (!event_class) {
+               BT_LOGE_STR("Failed to allocate one event class.");
                goto error;
        }
 
@@ -64,27 +74,33 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
        bt_object_init(event_class, bt_ctf_event_class_destroy);
        event_class->fields = bt_ctf_field_type_structure_create();
        if (!event_class->fields) {
+               BT_LOGE_STR("Cannot create event class's initial payload field type object.");
                goto error;
        }
 
        event_class->context = bt_ctf_field_type_structure_create();
        if (!event_class->context) {
+               BT_LOGE_STR("Cannot create event class's initial context field type object.");
                goto error;
        }
 
        event_class->attributes = bt_ctf_attributes_create();
        if (!event_class->attributes) {
+               BT_LOGE_STR("Cannot create event class's attributes object.");
                goto error;
        }
 
        obj = bt_value_integer_create_init(-1);
        if (!obj) {
+               BT_LOGE_STR("Cannot create integer value object.");
                goto error;
        }
 
        ret = bt_ctf_attributes_set_field_value(event_class->attributes,
                "id", obj);
        if (ret) {
+               BT_LOGE("Cannot set event class's attributes's `id` field: ret=%d",
+                       ret);
                goto error;
        }
 
@@ -92,17 +108,21 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
 
        obj = bt_value_string_create_init(name);
        if (!obj) {
+               BT_LOGE_STR("Cannot create string value object.");
                goto error;
        }
 
        ret = bt_ctf_attributes_set_field_value(event_class->attributes,
                "name", obj);
        if (ret) {
+               BT_LOGE("Cannot set event class's attributes's `name` field: ret=%d",
+                       ret);
                goto error;
        }
 
        BT_PUT(obj);
-
+       BT_LOGD("Created event class object: addr=%p, name=\"%s\"",
+               event_class, bt_ctf_event_class_get_name(event_class));
        return event_class;
 
 error:
@@ -115,8 +135,10 @@ const char *bt_ctf_event_class_get_name(struct bt_ctf_event_class *event_class)
 {
        struct bt_value *obj = NULL;
        const char *name = NULL;
+       int ret;
 
        if (!event_class) {
+               BT_LOGW_STR("Invalid parameter: event class is NULL.");
                goto end;
        }
 
@@ -127,13 +149,9 @@ const char *bt_ctf_event_class_get_name(struct bt_ctf_event_class *event_class)
 
        obj = bt_ctf_attributes_get_field_value(event_class->attributes,
                BT_CTF_EVENT_CLASS_ATTR_NAME_INDEX);
-       if (!obj) {
-               goto end;
-       }
-
-       if (bt_value_string_get(obj, &name)) {
-               name = NULL;
-       }
+       assert(obj);
+       ret = bt_value_string_get(obj, &name);
+       assert(ret == 0);
 
 end:
        BT_PUT(obj);
@@ -144,8 +162,10 @@ int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class)
 {
        struct bt_value *obj = NULL;
        int64_t ret = 0;
+       int int_ret;
 
        if (!event_class) {
+               BT_LOGW_STR("Invalid parameter: event class is NULL.");
                ret = (int64_t) -1;
                goto end;
        }
@@ -157,16 +177,13 @@ int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class)
 
        obj = bt_ctf_attributes_get_field_value(event_class->attributes,
                BT_CTF_EVENT_CLASS_ATTR_ID_INDEX);
-       if (!obj) {
-               goto end;
-       }
-
-       if (bt_value_integer_get(obj, &ret)) {
-               ret = (int64_t) -1;
-       }
-
+       assert(obj);
+       int_ret = bt_value_integer_get(obj, &ret);
+       assert(int_ret == 0);
        if (ret < 0) {
                /* means ID is not set */
+               BT_LOGV("Event class's ID is not set: addr=%p, name=\"%s\"",
+                       event_class, bt_ctf_event_class_get_name(event_class));
                ret = (int64_t) -1;
                goto end;
        }
@@ -181,38 +198,43 @@ int bt_ctf_event_class_set_id(struct bt_ctf_event_class *event_class,
 {
        int ret = 0;
        struct bt_value *obj = NULL;
-       struct bt_ctf_stream_class *stream_class = NULL;
        int64_t id = (int64_t) id_param;
 
-       if (!event_class || id < 0) {
+       if (!event_class) {
+               BT_LOGW_STR("Invalid parameter: event class is NULL.");
                ret = -1;
                goto end;
        }
 
-       stream_class = bt_ctf_event_class_get_stream_class(event_class);
-       if (stream_class) {
-               /*
-                * We don't allow changing the id if the event class has already
-                * been added to a stream class.
-                */
+       if (event_class->frozen) {
+               BT_LOGW("Invalid parameter: event class is frozen: "
+                       "addr=%p, name=\"%s\", id=%" PRId64,
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class));
                ret = -1;
                goto end;
        }
 
-       obj = bt_ctf_attributes_get_field_value(event_class->attributes,
-               BT_CTF_EVENT_CLASS_ATTR_ID_INDEX);
-       if (!obj) {
-               goto end;
-       }
-
-       if (bt_value_integer_set(obj, id)) {
+       if (id < 0) {
+               BT_LOGW("Invalid parameter: invalid event class's ID: "
+                       "addr=%p, name=\"%s\", id=%" PRIu64,
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       id_param);
                ret = -1;
                goto end;
        }
 
+       obj = bt_ctf_attributes_get_field_value(event_class->attributes,
+               BT_CTF_EVENT_CLASS_ATTR_ID_INDEX);
+       assert(obj);
+       ret = bt_value_integer_set(obj, id);
+       assert(ret == 0);
+       BT_LOGV("Set event class's ID: "
+               "addr=%p, name=\"%s\", id=%" PRId64,
+               event_class, bt_ctf_event_class_get_name(event_class), id);
+
 end:
        BT_PUT(obj);
-       BT_PUT(stream_class);
        return ret;
 }
 
@@ -222,7 +244,19 @@ int bt_ctf_event_class_set_attribute(
 {
        int ret = 0;
 
-       if (!event_class || !name || !value || event_class->frozen) {
+       if (!event_class || !name || !value) {
+               BT_LOGW("Invalid parameter: event class, name, or value is NULL: "
+                       "event-class-addr=%p, name-addr=%p, value-addr=%p",
+                       event_class, name, value);
+               ret = -1;
+               goto end;
+       }
+
+       if (event_class->frozen) {
+               BT_LOGW("Invalid parameter: event class is frozen: "
+                       "addr=%p, name=\"%s\", id=%" PRId64 ", attr-name=\"%s\"",
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class), name);
                ret = -1;
                goto end;
        }
@@ -230,17 +264,36 @@ int bt_ctf_event_class_set_attribute(
        if (!strcmp(name, "id") || !strcmp(name, "loglevel") ||
                        !strcmp(name, "stream_id")) {
                if (!bt_value_is_integer(value)) {
+                       BT_LOGW("Invalid parameter: this event class's attribute must have an integer value: "
+                               "event-class-addr=%p, event-class-name=\"%s\", "
+                               "event-class-id=%" PRId64 ", attr-name=\"%s\", "
+                               "attr-type=%s", event_class,
+                               bt_ctf_event_class_get_name(event_class),
+                               bt_ctf_event_class_get_id(event_class), name,
+                               bt_value_type_string(bt_value_get_type(value)));
                        ret = -1;
                        goto end;
                }
        } else if (!strcmp(name, "name") || !strcmp(name, "model.emf.uri") ||
                        !strcmp(name, "loglevel_string")) {
                if (!bt_value_is_string(value)) {
+                       BT_LOGW("Invalid parameter: this event class's attribute must have a string value: "
+                               "event-class-addr=%p, event-class-name=\"%s\", "
+                               "event-class-id=%" PRId64 ", attr-name=\"%s\", "
+                               "attr-type=%s", event_class,
+                               bt_ctf_event_class_get_name(event_class),
+                               bt_ctf_event_class_get_id(event_class), name,
+                               bt_value_type_string(bt_value_get_type(value)));
                        ret = -1;
                        goto end;
                }
        } else {
                /* unknown attribute */
+               BT_LOGW("Invalid parameter: unknown event class's attribute name: "
+                       "event-class-addr=%p, event-class-name=\"%s\", "
+                       "event-class-id=%" PRId64 ", attr-name=\"%s\"",
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class), name);
                ret = -1;
                goto end;
        }
@@ -250,19 +303,44 @@ int bt_ctf_event_class_set_attribute(
                int64_t val;
 
                ret = bt_value_integer_get(value, &val);
-
+               assert(ret == 0);
+               ret = bt_ctf_event_class_set_id(event_class, (uint64_t) val);
                if (ret) {
                        goto end;
                }
-
-               if (val < 0) {
-                       ret = -1;
-                       goto end;
-               }
        }
 
        ret = bt_ctf_attributes_set_field_value(event_class->attributes,
                        name, value);
+       assert(ret == 0);
+
+       if (BT_LOG_ON_VERBOSE) {
+               if (bt_value_is_integer(value)) {
+                       int64_t val;
+
+                       ret = bt_value_integer_get(value, &val);
+                       assert(ret == 0);
+                       BT_LOGV("Set event class's integer attribute: "
+                               "event-class-addr=%p, event-class-name=\"%s\", "
+                               "event-class-id=%" PRId64 ", attr-name=\"%s\", "
+                               "attr-value=%" PRId64,
+                               event_class, bt_ctf_event_class_get_name(event_class),
+                               bt_ctf_event_class_get_id(event_class), name,
+                               val);
+               } else if (bt_value_is_string(value)) {
+                       const char *val;
+
+                       ret = bt_value_string_get(value, &val);
+                       assert(ret == 0);
+                       BT_LOGV("Set event class's string attribute: "
+                               "event-class-addr=%p, event-class-name=\"%s\", "
+                               "event-class-id=%" PRId64 ", attr-name=\"%s\", "
+                               "attr-value=\"%s\"",
+                               event_class, bt_ctf_event_class_get_name(event_class),
+                               bt_ctf_event_class_get_id(event_class), name,
+                               val);
+               }
+       }
 
 end:
        return ret;
@@ -274,11 +352,13 @@ int64_t bt_ctf_event_class_get_attribute_count(
        int64_t ret;
 
        if (!event_class) {
+               BT_LOGW_STR("Invalid parameter: event class is NULL.");
                ret = (int64_t) -1;
                goto end;
        }
 
        ret = bt_ctf_attributes_get_count(event_class->attributes);
+       assert(ret >= 0);
 
 end:
        return ret;
@@ -291,11 +371,18 @@ bt_ctf_event_class_get_attribute_name_by_index(
        const char *ret;
 
        if (!event_class) {
+               BT_LOGW_STR("Invalid parameter: event class is NULL.");
                ret = NULL;
                goto end;
        }
 
        ret = bt_ctf_attributes_get_field_name(event_class->attributes, index);
+       if (ret) {
+               BT_LOGW("Cannot get event class's attribute name by index: "
+                       "addr=%p, name=\"%s\", id=%" PRId64 ", index=%" PRIu64,
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class), index);
+       }
 
 end:
        return ret;
@@ -308,11 +395,18 @@ bt_ctf_event_class_get_attribute_value_by_index(
        struct bt_value *ret;
 
        if (!event_class) {
+               BT_LOGW_STR("Invalid parameter: event class is NULL.");
                ret = NULL;
                goto end;
        }
 
        ret = bt_ctf_attributes_get_field_value(event_class->attributes, index);
+       if (ret) {
+               BT_LOGW("Cannot get event class's attribute value by index: "
+                       "addr=%p, name=\"%s\", id=%" PRId64 ", index=%" PRIu64,
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class), index);
+       }
 
 end:
        return ret;
@@ -325,12 +419,22 @@ bt_ctf_event_class_get_attribute_value_by_name(
        struct bt_value *ret;
 
        if (!event_class || !name) {
+               BT_LOGW("Invalid parameter: event class or name is NULL: ",
+                       "event-class-addr=%p, name-addr=%p",
+                       event_class, name);
                ret = NULL;
                goto end;
        }
 
        ret = bt_ctf_attributes_get_field_value_by_name(event_class->attributes,
                name);
+       if (ret) {
+               BT_LOGV("Cannot find event class's attribute: "
+                       "addr=%p, event-class-name=\"%s\", id=%" PRId64 ", "
+                       "attr-name=\"%s\"",
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class), name);
+       }
 
 end:
        return ret;
@@ -351,6 +455,7 @@ struct bt_ctf_field_type *bt_ctf_event_class_get_payload_type(
        struct bt_ctf_field_type *payload = NULL;
 
        if (!event_class) {
+               BT_LOGW_STR("Invalid parameter: event class is NULL.");
                goto end;
        }
 
@@ -366,18 +471,31 @@ int bt_ctf_event_class_set_payload_type(struct bt_ctf_event_class *event_class,
        int ret = 0;
 
        if (!event_class) {
+               BT_LOGW_STR("Invalid parameter: event class is NULL.");
                ret = -1;
                goto end;
        }
 
        if (payload && bt_ctf_field_type_get_type_id(payload) !=
                        BT_CTF_FIELD_TYPE_ID_STRUCT) {
+               BT_LOGW("Invalid parameter: event class's payload field type must be a structure: "
+                       "addr=%p, name=\"%s\", id=%" PRId64 ", "
+                       "payload-ft-addr=%p, payload-ft-id=%s",
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class), payload,
+                       bt_ctf_field_type_id_string(
+                               bt_ctf_field_type_get_type_id(payload)));
                ret = -1;
                goto end;
        }
 
        bt_put(event_class->fields);
        event_class->fields = bt_get(payload);
+       BT_LOGV("Set event class's payload field type: "
+               "event-class-addr=%p, event-class-name=\"%s\", "
+               "event-class-id=%" PRId64 ", payload-ft-addr=%p",
+               event_class, bt_ctf_event_class_get_name(event_class),
+               bt_ctf_event_class_get_id(event_class), payload);
 end:
        return ret;
 }
@@ -388,20 +506,51 @@ int bt_ctf_event_class_add_field(struct bt_ctf_event_class *event_class,
 {
        int ret = 0;
 
-       if (!event_class || !type || bt_ctf_validate_identifier(name) ||
-               event_class->frozen) {
+       if (!event_class || !type) {
+               BT_LOGW("Invalid parameter: event class or field type is NULL: "
+                       "event-class-addr=%p, field-type-addr=%p",
+                       event_class, type);
+               ret = -1;
+               goto end;
+       }
+
+       if (bt_ctf_validate_identifier(name)) {
+               BT_LOGW("Invalid parameter: event class's payload field type's field name is not a valid CTF identifier: "
+                       "addr=%p, name=\"%s\", id=%" PRId64 ", field-name=\"%s\"",
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class),
+                       name);
                ret = -1;
                goto end;
        }
 
-       if (bt_ctf_field_type_get_type_id(event_class->fields) !=
-               BT_CTF_FIELD_TYPE_ID_STRUCT) {
+       if (event_class->frozen) {
+               BT_LOGW("Invalid parameter: event class is frozen: "
+                       "addr=%p, name=\"%s\", id=%" PRId64,
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class));
                ret = -1;
                goto end;
        }
 
+       if (!event_class->fields) {
+               BT_LOGW("Event class has no payload field type: "
+                       "addr=%p, name=\"%s\", id=%" PRId64,
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class));
+               ret = -1;
+               goto end;
+       }
+
+       assert(bt_ctf_field_type_get_type_id(event_class->fields) ==
+               BT_CTF_FIELD_TYPE_ID_STRUCT);
        ret = bt_ctf_field_type_structure_add_field(event_class->fields,
                type, name);
+       BT_LOGV("Added field to event class's payload field type: "
+               "event-class-addr=%p, event-class-name=\"%s\", "
+               "event-class-id=%" PRId64 ", field-name=\"%s\", ft-addr=%p",
+               event_class, bt_ctf_event_class_get_name(event_class),
+               bt_ctf_event_class_get_id(event_class), name, type);
 end:
        return ret;
 }
@@ -412,16 +561,22 @@ int64_t bt_ctf_event_class_get_payload_type_field_count(
        int64_t ret;
 
        if (!event_class) {
+               BT_LOGW_STR("Invalid parameter: event class is NULL.");
                ret = (int64_t) -1;
                goto end;
        }
 
-       if (bt_ctf_field_type_get_type_id(event_class->fields) !=
-               BT_CTF_FIELD_TYPE_ID_STRUCT) {
+       if (!event_class->fields) {
+               BT_LOGV("Event class has no payload field type: "
+                       "addr=%p, name=\"%s\", id=%" PRId64,
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class));
                ret = (int64_t) -1;
                goto end;
        }
 
+       assert(bt_ctf_field_type_get_type_id(event_class->fields) ==
+               BT_CTF_FIELD_TYPE_ID_STRUCT);
        ret = bt_ctf_field_type_structure_get_field_count(event_class->fields);
 end:
        return ret;
@@ -435,16 +590,22 @@ int bt_ctf_event_class_get_payload_type_field_by_index(
        int ret;
 
        if (!event_class) {
+               BT_LOGW_STR("Invalid parameter: event class is NULL.");
                ret = -1;
                goto end;
        }
 
-       if (bt_ctf_field_type_get_type_id(event_class->fields) !=
-               BT_CTF_FIELD_TYPE_ID_STRUCT) {
+       if (!event_class->fields) {
+               BT_LOGV("Event class has no payload field type: "
+                       "addr=%p, name=\"%s\", id=%" PRId64 ", index=%" PRIu64,
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class), index);
                ret = -1;
                goto end;
        }
 
+       assert(bt_ctf_field_type_get_type_id(event_class->fields) ==
+               BT_CTF_FIELD_TYPE_ID_STRUCT);
        ret = bt_ctf_field_type_structure_get_field(event_class->fields,
                field_name, field_type, index);
 end:
@@ -459,16 +620,25 @@ bt_ctf_event_class_get_payload_type_field_type_by_name(
        struct bt_ctf_field_type *field_type = NULL;
 
        if (!event_class || !name) {
+               BT_LOGW("Invalid parameter: event class or name is NULL: ",
+                       "event-class-addr=%p, name-addr=%p",
+                       event_class, name);
                goto end;
        }
 
-       if (bt_ctf_field_type_get_type_id(event_class->fields) !=
-               BT_CTF_FIELD_TYPE_ID_STRUCT) {
+       if (!event_class->fields) {
+               BT_LOGV("Event class has no payload field type: "
+                       "addr=%p, name=\"%s\", id=%" PRId64,
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class));
                goto end;
        }
 
+       assert(bt_ctf_field_type_get_type_id(event_class->fields) ==
+               BT_CTF_FIELD_TYPE_ID_STRUCT);
        name_quark = g_quark_try_string(name);
        if (!name_quark) {
+               BT_LOGE("Cannot get GQuark: string=\"%s\"", name);
                goto end;
        }
 
@@ -487,7 +657,16 @@ struct bt_ctf_field_type *bt_ctf_event_class_get_context_type(
 {
        struct bt_ctf_field_type *context_type = NULL;
 
-       if (!event_class || !event_class->context) {
+       if (!event_class) {
+               BT_LOGW_STR("Invalid parameter: event class is NULL.");
+               goto end;
+       }
+
+       if (!event_class->context) {
+               BT_LOGV("Event class has no context field type: "
+                       "addr=%p, name=\"%s\", id=%" PRId64,
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class));
                goto end;
        }
 
@@ -503,29 +682,53 @@ int bt_ctf_event_class_set_context_type(
 {
        int ret = 0;
 
-       if (!event_class || event_class->frozen) {
+       if (!event_class) {
+               BT_LOGW_STR("Invalid parameter: event class is NULL.");
+               ret = -1;
+               goto end;
+       }
+
+       if (event_class->frozen) {
+               BT_LOGW("Invalid parameter: event class is frozen: "
+                       "addr=%p, name=\"%s\", id=%" PRId64,
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class));
                ret = -1;
                goto end;
        }
 
        if (context && bt_ctf_field_type_get_type_id(context) !=
                        BT_CTF_FIELD_TYPE_ID_STRUCT) {
+               BT_LOGW("Invalid parameter: event class's context field type must be a structure: "
+                       "addr=%p, name=\"%s\", id=%" PRId64 ", "
+                       "context-ft-id=%s",
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class),
+                       bt_ctf_field_type_id_string(
+                               bt_ctf_field_type_get_type_id(context)));
                ret = -1;
                goto end;
        }
 
        bt_put(event_class->context);
        event_class->context = bt_get(context);
+       BT_LOGV("Set event class's context field type: "
+               "event-class-addr=%p, event-class-name=\"%s\", "
+               "event-class-id=%" PRId64 ", context-ft-addr=%p",
+               event_class, bt_ctf_event_class_get_name(event_class),
+               bt_ctf_event_class_get_id(event_class), context);
 end:
        return ret;
 
 }
 
+/* Pre-2.0 CTF writer backward compatibility */
 void bt_ctf_event_class_get(struct bt_ctf_event_class *event_class)
 {
        bt_get(event_class);
 }
 
+/* Pre-2.0 CTF writer backward compatibility */
 void bt_ctf_event_class_put(struct bt_ctf_event_class *event_class)
 {
        bt_put(event_class);
@@ -540,26 +743,35 @@ int bt_ctf_event_class_set_stream_id(struct bt_ctf_event_class *event_class,
        int64_t stream_id = (int64_t) stream_id_param;
 
        assert(event_class);
-
-       if (stream_id < 0) {
-               ret = -1;
-               goto end;
-       }
-
+       assert(stream_id >= 0);
        obj = bt_value_integer_create_init(stream_id);
-
        if (!obj) {
+               BT_LOGE_STR("Cannot create integer value object.");
                ret = -1;
                goto end;
        }
 
        ret = bt_ctf_attributes_set_field_value(event_class->attributes,
                "stream_id", obj);
+       if (ret) {
+               BT_LOGE("Cannot set event class's attributes's `stream_id` field: "
+                       "addr=%p, name=\"%s\", id=%" PRId64 ", ret=%d",
+                       event_class, bt_ctf_event_class_get_name(event_class),
+                       bt_ctf_event_class_get_id(event_class), ret);
+               goto end;
+       }
 
        if (event_class->frozen) {
+               BT_LOGV_STR("Freezing event class's attributes because event class is frozen.");
                bt_ctf_attributes_freeze(event_class->attributes);
        }
 
+       BT_LOGV("Set event class's stream class ID: "
+               "event-class-addr=%p, event-class-name=\"%s\", "
+               "event-class-id=%" PRId64 ", stream-class-id=%" PRId64,
+               event_class, bt_ctf_event_class_get_name(event_class),
+               bt_ctf_event_class_get_id(event_class), stream_id);
+
 end:
        BT_PUT(obj);
        return ret;
@@ -571,6 +783,9 @@ void bt_ctf_event_class_destroy(struct bt_object *obj)
        struct bt_ctf_event_class *event_class;
 
        event_class = container_of(obj, struct bt_ctf_event_class, base);
+       BT_LOGD("Destroying event class: addr=%p, name=\"%s\", id=%" PRId64,
+               event_class, bt_ctf_event_class_get_name(event_class),
+               bt_ctf_event_class_get_id(event_class));
        bt_ctf_attributes_destroy(event_class->attributes);
        bt_put(event_class->context);
        bt_put(event_class->fields);
@@ -581,6 +796,14 @@ BT_HIDDEN
 void bt_ctf_event_class_freeze(struct bt_ctf_event_class *event_class)
 {
        assert(event_class);
+
+       if (event_class->frozen) {
+               return;
+       }
+
+       BT_LOGD("Freezing event class: addr=%p, name=\"%s\", id=%" PRId64,
+               event_class, bt_ctf_event_class_get_name(event_class),
+               bt_ctf_event_class_get_id(event_class));
        event_class->frozen = 1;
        event_class->name = bt_ctf_event_class_get_name(event_class);
        event_class->id = bt_ctf_event_class_get_id(event_class);
@@ -600,29 +823,26 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 
        assert(event_class);
        assert(context);
-
+       BT_LOGD("Serializing event class's metadata: "
+               "event-class-addr=%p, event-class-name=\"%s\", "
+               "event-class-id=%" PRId64 ", metadata-context-addr=%p",
+               event_class, bt_ctf_event_class_get_name(event_class),
+               bt_ctf_event_class_get_id(event_class), context);
        context->current_indentation_level = 1;
        g_string_assign(context->field_name, "");
        g_string_append(context->string, "event {\n");
        count = bt_ctf_event_class_get_attribute_count(event_class);
-
-       if (count < 0) {
-               ret = -1;
-               goto end;
-       }
+       assert(count >= 0);
 
        for (i = 0; i < count; ++i) {
                const char *attr_name = NULL;
 
                attr_name = bt_ctf_event_class_get_attribute_name_by_index(
                        event_class, i);
+               assert(attr_name);
                attr_value = bt_ctf_event_class_get_attribute_value_by_index(
                        event_class, i);
-
-               if (!attr_name || !attr_value) {
-                       ret = -1;
-                       goto end;
-               }
+               assert(attr_value);
 
                switch (bt_value_get_type(attr_value)) {
                case BT_VALUE_TYPE_INTEGER:
@@ -630,11 +850,7 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
                        int64_t value;
 
                        ret = bt_value_integer_get(attr_value, &value);
-
-                       if (ret) {
-                               goto end;
-                       }
-
+                       assert(ret == 0);
                        g_string_append_printf(context->string,
                                "\t%s = %" PRId64 ";\n", attr_name, value);
                        break;
@@ -645,11 +861,7 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
                        const char *value;
 
                        ret = bt_value_string_get(attr_value, &value);
-
-                       if (ret) {
-                               goto end;
-                       }
-
+                       assert(ret == 0);
                        g_string_append_printf(context->string,
                                "\t%s = \"%s\";\n", attr_name, value);
                        break;
@@ -669,6 +881,8 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
                ret = bt_ctf_field_type_serialize(event_class->context,
                        context);
                if (ret) {
+                       BT_LOGE("Cannot serialize event class's context field type's metadata: "
+                               "ret=%d", ret);
                        goto end;
                }
                g_string_append(context->string, ";\n");
@@ -678,6 +892,8 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
                g_string_append(context->string, "\tfields := ");
                ret = bt_ctf_field_type_serialize(event_class->fields, context);
                if (ret) {
+                       BT_LOGE("Cannot serialize event class's payload field type's metadata: "
+                               "ret=%d", ret);
                        goto end;
                }
                g_string_append(context->string, ";\n");
This page took 0.039204 seconds and 4 git commands to generate.