lib: use BT_LIB_LOG*_APPEND_CAUSE() where appropriate

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

diff --git a/src/lib/trace-ir/trace-class.c b/src/lib/trace-ir/trace-class.c
index bd8ff19f2eb3ac030d1ee08c80a2bc27c1bc9271..1201534c919d4fd0cb74291879a140519c1c8435 100644 (file)
--- a/src/lib/trace-ir/trace-class.c
+++ b/src/lib/trace-ir/trace-class.c
@@ -54,6 +54,7 @@
 #include "stream.h"
 #include "trace.h"
 #include "utils.h"
+#include "lib/func-status.h"
 
 struct bt_trace_class_destruction_listener_elem {
        bt_trace_class_destruction_listener_func func;
@@ -138,7 +139,7 @@ struct bt_trace_class *bt_trace_class_create(bt_self_component *self_comp)
        BT_LOGD_STR("Creating default trace class object.");
        tc = g_new0(struct bt_trace_class, 1);
        if (!tc) {
-               BT_LOGE_STR("Failed to allocate one trace class.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one trace class.");
                goto error;
        }
 
@@ -147,26 +148,26 @@ struct bt_trace_class *bt_trace_class_create(bt_self_component *self_comp)
        tc->stream_classes = g_ptr_array_new_with_free_func(
                (GDestroyNotify) bt_object_try_spec_release);
        if (!tc->stream_classes) {
-               BT_LOGE_STR("Failed to allocate one GPtrArray.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray.");
                goto error;
        }
 
        tc->name.str = g_string_new(NULL);
        if (!tc->name.str) {
-               BT_LOGE_STR("Failed to allocate one GString.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GString.");
                goto error;
        }
 
        tc->environment = bt_attributes_create();
        if (!tc->environment) {
-               BT_LOGE_STR("Cannot create empty attributes object.");
+               BT_LIB_LOGE_APPEND_CAUSE("Cannot create empty attributes object.");
                goto error;
        }
 
        tc->destruction_listeners = g_array_new(FALSE, TRUE,
                sizeof(struct bt_trace_class_destruction_listener_elem));
        if (!tc->destruction_listeners) {
-               BT_LOGE_STR("Failed to allocate one GArray.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GArray.");
                goto error;
        }
 
@@ -187,7 +188,7 @@ const char *bt_trace_class_get_name(const struct bt_trace_class *tc)
        return tc->name.value;
 }
 
-enum bt_trace_class_status bt_trace_class_set_name(
+enum bt_trace_class_set_name_status bt_trace_class_set_name(
                struct bt_trace_class *tc, const char *name)
 {
        BT_ASSERT_PRE_NON_NULL(tc, "Trace class");
@@ -196,7 +197,7 @@ enum bt_trace_class_status bt_trace_class_set_name(
        g_string_assign(tc->name.str, name);
        tc->name.value = tc->name.str->str;
        BT_LIB_LOGD("Set trace class's name: %!+T", tc);
-       return BT_TRACE_CLASS_STATUS_OK;
+       return BT_FUNC_STATUS_OK;
 }
 
 bt_uuid bt_trace_class_get_uuid(const struct bt_trace_class *tc)
@@ -215,7 +216,7 @@ void bt_trace_class_set_uuid(struct bt_trace_class *tc, bt_uuid uuid)
        BT_LIB_LOGD("Set trace class's UUID: %!+T", tc);
 }
 
-enum bt_trace_class_status bt_trace_class_add_destruction_listener(
+enum bt_trace_class_add_listener_status bt_trace_class_add_destruction_listener(
                const struct bt_trace_class *_tc,
                bt_trace_class_destruction_listener_func listener,
                void *data, uint64_t *listener_id)
@@ -253,7 +254,7 @@ enum bt_trace_class_status bt_trace_class_add_destruction_listener(
 
        BT_LIB_LOGD("Added trace class destruction listener: %![tc-]+T, "
                        "listener-id=%" PRIu64, tc, i);
-       return BT_TRACE_CLASS_STATUS_OK;
+       return BT_FUNC_STATUS_OK;
 }
 
 BT_ASSERT_PRE_FUNC
@@ -266,7 +267,7 @@ bool has_listener_id(const struct bt_trace_class *tc, uint64_t listener_id)
                        listener_id))->func != NULL;
 }
 
-enum bt_trace_class_status bt_trace_class_remove_destruction_listener(
+enum bt_trace_class_remove_listener_status bt_trace_class_remove_destruction_listener(
                const struct bt_trace_class *_tc, uint64_t listener_id)
 {
        struct bt_trace_class *tc = (void *) _tc;
@@ -286,7 +287,7 @@ enum bt_trace_class_status bt_trace_class_remove_destruction_listener(
        BT_LIB_LOGD("Removed trace class destruction listener: "
                "%![tc-]+T, listener-id=%" PRIu64,
                tc, listener_id);
-       return BT_TRACE_CLASS_STATUS_OK;
+       return BT_FUNC_STATUS_OK;
 }
 
 BT_ASSERT_FUNC
@@ -300,7 +301,8 @@ bool trace_has_environment_entry(const struct bt_trace_class *tc, const char *na
 }
 
 static
-enum bt_trace_class_status set_environment_entry(struct bt_trace_class *tc,
+enum bt_trace_class_set_environment_entry_status set_environment_entry(
+               struct bt_trace_class *tc,
                const char *name, struct bt_value *value)
 {
        int ret;
@@ -315,8 +317,9 @@ enum bt_trace_class_status set_environment_entry(struct bt_trace_class *tc,
        ret = bt_attributes_set_field_value(tc->environment, name,
                value);
        if (ret) {
-               ret = BT_TRACE_CLASS_STATUS_NOMEM;
-               BT_LIB_LOGE("Cannot set trace class's environment entry: "
+               ret = BT_FUNC_STATUS_MEMORY_ERROR;
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Cannot set trace class's environment entry: "
                        "%![tc-]+T, entry-name=\"%s\"", tc, name);
        } else {
                bt_value_freeze(value);
@@ -327,7 +330,8 @@ enum bt_trace_class_status set_environment_entry(struct bt_trace_class *tc,
        return ret;
 }
 
-enum bt_trace_class_status bt_trace_class_set_environment_entry_string(
+enum bt_trace_class_set_environment_entry_status
+bt_trace_class_set_environment_entry_string(
                struct bt_trace_class *tc, const char *name, const char *value)
 {
        int ret;
@@ -337,7 +341,8 @@ enum bt_trace_class_status bt_trace_class_set_environment_entry_string(
        BT_ASSERT_PRE_NON_NULL(value, "Value");
        value_obj = bt_value_string_create_init(value);
        if (!value_obj) {
-               BT_LOGE_STR("Cannot create a string value object.");
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Cannot create a string value object.");
                ret = -1;
                goto end;
        }
@@ -350,7 +355,8 @@ end:
        return ret;
 }
 
-enum bt_trace_class_status bt_trace_class_set_environment_entry_integer(
+enum bt_trace_class_set_environment_entry_status
+bt_trace_class_set_environment_entry_integer(
                struct bt_trace_class *tc, const char *name, int64_t value)
 {
        int ret;
@@ -359,8 +365,9 @@ enum bt_trace_class_status bt_trace_class_set_environment_entry_integer(
        BT_ASSERT_PRE_NON_NULL(name, "Name");
        value_obj = bt_value_signed_integer_create_init(value);
        if (!value_obj) {
-               BT_LOGE_STR("Cannot create an integer value object.");
-               ret = BT_TRACE_CLASS_STATUS_NOMEM;
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Cannot create an integer value object.");
+               ret = BT_FUNC_STATUS_MEMORY_ERROR;
                goto end;
        }