lib: remove `BT_ASSERT_PRE_FUNC`

[babeltrace.git] / src / lib / trace-ir / event-class.c

diff --git a/src/lib/trace-ir/event-class.c b/src/lib/trace-ir/event-class.c
index 63a250bbef3ce7ad6808f1776022bddc1c4a5d13..c5e5230e160d049b46f80da2445716de274762bb 100644 (file)
--- a/src/lib/trace-ir/event-class.c
+++ b/src/lib/trace-ir/event-class.c
@@ -47,9 +47,10 @@
 #include "stream-class.h"
 #include "trace.h"
 #include "utils.h"
+#include "lib/func-status.h"
 
-#define BT_ASSERT_PRE_EVENT_CLASS_HOT(_ec) \
-       BT_ASSERT_PRE_HOT(((const struct bt_event_class *) (_ec)),      \
+#define BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(_ec) \
+       BT_ASSERT_PRE_DEV_HOT(((const struct bt_event_class *) (_ec)),  \
                "Event class", ": %!+E", (_ec))
 
 static
@@ -84,7 +85,6 @@ void free_event(struct bt_event *event,
        bt_event_destroy(event);
 }
 
-BT_ASSERT_PRE_FUNC
 static
 bool event_class_id_is_unique(const struct bt_stream_class *stream_class,
                uint64_t id)
@@ -121,7 +121,7 @@ struct bt_event_class *create_event_class_with_id(
                stream_class, id);
        event_class = g_new0(struct bt_event_class, 1);
        if (!event_class) {
-               BT_LOGE_STR("Failed to allocate one event class.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one event class.");
                goto error;
        }
 
@@ -132,14 +132,14 @@ struct bt_event_class *create_event_class_with_id(
                        BT_PROPERTY_AVAILABILITY_NOT_AVAILABLE, 0);
        event_class->name.str = g_string_new(NULL);
        if (!event_class->name.str) {
-               BT_LOGE_STR("Failed to allocate a GString.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
                ret = -1;
                goto end;
        }
 
        event_class->emf_uri.str = g_string_new(NULL);
        if (!event_class->emf_uri.str) {
-               BT_LOGE_STR("Failed to allocate a GString.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
                ret = -1;
                goto end;
        }
@@ -149,7 +149,8 @@ struct bt_event_class *create_event_class_with_id(
                (bt_object_pool_destroy_object_func) free_event,
                event_class);
        if (ret) {
-               BT_LOGE("Failed to initialize event pool: ret=%d",
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Failed to initialize event pool: ret=%d",
                        ret);
                goto error;
        }
@@ -189,25 +190,25 @@ struct bt_event_class *bt_event_class_create_with_id(
 
 const char *bt_event_class_get_name(const struct bt_event_class *event_class)
 {
-       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+       BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
        return event_class->name.value;
 }
 
-enum bt_event_class_status bt_event_class_set_name(
+enum bt_event_class_set_name_status bt_event_class_set_name(
                struct bt_event_class *event_class, const char *name)
 {
        BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
        BT_ASSERT_PRE_NON_NULL(name, "Name");
-       BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
+       BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(event_class);
        g_string_assign(event_class->name.str, name);
        event_class->name.value = event_class->name.str->str;
        BT_LIB_LOGD("Set event class's name: %!+E", event_class);
-       return BT_EVENT_CLASS_STATUS_OK;
+       return BT_FUNC_STATUS_OK;
 }
 
 uint64_t bt_event_class_get_id(const struct bt_event_class *event_class)
 {
-       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+       BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
        return event_class->id;
 }
 
@@ -215,8 +216,8 @@ enum bt_property_availability bt_event_class_get_log_level(
                const struct bt_event_class *event_class,
                enum bt_event_class_log_level *log_level)
 {
-       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
-       BT_ASSERT_PRE_NON_NULL(log_level, "Log level (output)");
+       BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
+       BT_ASSERT_PRE_DEV_NON_NULL(log_level, "Log level (output)");
        *log_level = (enum bt_event_class_log_level)
                event_class->log_level.value;
        return event_class->log_level.base.avail;
@@ -227,7 +228,7 @@ void bt_event_class_set_log_level(
                enum bt_event_class_log_level log_level)
 {
        BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
-       BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
+       BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(event_class);
        bt_property_uint_set(&event_class->log_level,
                (uint64_t) log_level);
        BT_LIB_LOGD("Set event class's log level: %!+E", event_class);
@@ -235,27 +236,27 @@ void bt_event_class_set_log_level(
 
 const char *bt_event_class_get_emf_uri(const struct bt_event_class *event_class)
 {
-       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+       BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
        return event_class->emf_uri.value;
 }
 
-enum bt_event_class_status bt_event_class_set_emf_uri(
+enum bt_event_class_set_emf_uri_status bt_event_class_set_emf_uri(
                struct bt_event_class *event_class,
                const char *emf_uri)
 {
        BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
        BT_ASSERT_PRE_NON_NULL(emf_uri, "EMF URI");
-       BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
+       BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(event_class);
        g_string_assign(event_class->emf_uri.str, emf_uri);
        event_class->emf_uri.value = event_class->emf_uri.str->str;
        BT_LIB_LOGD("Set event class's EMF URI: %!+E", event_class);
-       return BT_EVENT_CLASS_STATUS_OK;
+       return BT_FUNC_STATUS_OK;
 }
 
 struct bt_stream_class *bt_event_class_borrow_stream_class(
                struct bt_event_class *event_class)
 {
-       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+       BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
        return bt_event_class_borrow_stream_class_inline(event_class);
 }
 
@@ -270,7 +271,7 @@ const struct bt_field_class *
 bt_event_class_borrow_specific_context_field_class_const(
                const struct bt_event_class *event_class)
 {
-       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+       BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
        return event_class->specific_context_fc;
 }
 
@@ -278,11 +279,12 @@ struct bt_field_class *
 bt_event_class_borrow_specific_context_field_class(
                struct bt_event_class *event_class)
 {
-       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+       BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
        return event_class->specific_context_fc;
 }
 
-enum bt_event_class_status bt_event_class_set_specific_context_field_class(
+enum bt_event_class_set_field_class_status
+bt_event_class_set_specific_context_field_class(
                struct bt_event_class *event_class,
                struct bt_field_class *field_class)
 {
@@ -297,7 +299,7 @@ enum bt_event_class_status bt_event_class_set_specific_context_field_class(
 
        BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
        BT_ASSERT_PRE_NON_NULL(field_class, "Field class");
-       BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
+       BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(event_class);
        BT_ASSERT_PRE(bt_field_class_get_type(field_class) ==
                BT_FIELD_CLASS_TYPE_STRUCTURE,
                "Specific context field class is not a structure field class: "
@@ -315,7 +317,7 @@ enum bt_event_class_status bt_event_class_set_specific_context_field_class(
                 * bt_resolve_field_paths() can fail: anything else
                 * would be because a precondition is not satisfied.
                 */
-               ret = BT_EVENT_CLASS_STATUS_NOMEM;
+               ret = BT_FUNC_STATUS_MEMORY_ERROR;
                goto end;
        }
 
@@ -334,18 +336,19 @@ end:
 const struct bt_field_class *bt_event_class_borrow_payload_field_class_const(
                const struct bt_event_class *event_class)
 {
-       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+       BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
        return event_class->payload_fc;
 }
 
 struct bt_field_class *bt_event_class_borrow_payload_field_class(
                struct bt_event_class *event_class)
 {
-       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+       BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
        return event_class->payload_fc;
 }
 
-enum bt_event_class_status bt_event_class_set_payload_field_class(
+enum bt_event_class_set_field_class_status
+bt_event_class_set_payload_field_class(
                struct bt_event_class *event_class,
                struct bt_field_class *field_class)
 {
@@ -360,7 +363,7 @@ enum bt_event_class_status bt_event_class_set_payload_field_class(
 
        BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
        BT_ASSERT_PRE_NON_NULL(field_class, "Field class");
-       BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
+       BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(event_class);
        BT_ASSERT_PRE(bt_field_class_get_type(field_class) ==
                BT_FIELD_CLASS_TYPE_STRUCTURE,
                "Payload field class is not a structure field class: %!+F",
@@ -379,7 +382,7 @@ enum bt_event_class_status bt_event_class_set_payload_field_class(
                 * bt_resolve_field_paths() can fail: anything else
                 * would be because a precondition is not satisfied.
                 */
-               ret = BT_EVENT_CLASS_STATUS_NOMEM;
+               ret = BT_FUNC_STATUS_MEMORY_ERROR;
                goto end;
        }