X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ftrace-class.c;h=a78c42a0ce1bffdf88cc97faac91ebfb0eb1bc50;hb=d24d56638469189904fb6ddbb3c725817b3e9417;hp=f05c7711eb8f10f1b088fcbefb88055991d5d958;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/lib/trace-ir/trace-class.c b/src/lib/trace-ir/trace-class.c
index f05c7711..a78c42a0 100644
--- a/src/lib/trace-ir/trace-class.c
+++ b/src/lib/trace-ir/trace-class.c
@@ -21,8 +21,8 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "TRACE"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/TRACE"
+#include "lib/logging.h"
 
 #include "lib/assert-pre.h"
 #include <babeltrace2/trace-ir/trace-class.h>
@@ -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;
@@ -75,7 +76,7 @@ void destroy_trace_class(struct bt_object *obj)
 	 */
 	if (tc->destruction_listeners) {
 		uint64_t i;
-		BT_LIB_LOGV("Calling trace class destruction listener(s): %!+T", tc);
+		BT_LIB_LOGD("Calling trace class destruction listener(s): %!+T", tc);
 
 		/*
 		* The trace class' reference count is 0 if we're here. Increment
@@ -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");
@@ -195,8 +196,8 @@ enum bt_trace_class_status bt_trace_class_set_name(
 	BT_ASSERT_PRE_TRACE_CLASS_HOT(tc);
 	g_string_assign(tc->name.str, name);
 	tc->name.value = tc->name.str->str;
-	BT_LIB_LOGV("Set trace class's name: %!+T", tc);
-	return BT_TRACE_CLASS_STATUS_OK;
+	BT_LIB_LOGD("Set trace class's name: %!+T", tc);
+	return BT_FUNC_STATUS_OK;
 }
 
 bt_uuid bt_trace_class_get_uuid(const struct bt_trace_class *tc)
@@ -212,10 +213,10 @@ void bt_trace_class_set_uuid(struct bt_trace_class *tc, bt_uuid uuid)
 	BT_ASSERT_PRE_TRACE_CLASS_HOT(tc);
 	memcpy(tc->uuid.uuid, uuid, BABELTRACE_UUID_LEN);
 	tc->uuid.value = tc->uuid.uuid;
-	BT_LIB_LOGV("Set trace class's UUID: %!+T", tc);
+	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)
@@ -251,9 +252,9 @@ enum bt_trace_class_status bt_trace_class_add_destruction_listener(
 		*listener_id = i;
 	}
 
-	BT_LIB_LOGV("Added trace class destruction listener: %![tc-]+T, "
+	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;
@@ -283,10 +284,10 @@ enum bt_trace_class_status bt_trace_class_remove_destruction_listener(
 
 	elem->func = NULL;
 	elem->data = NULL;
-	BT_LIB_LOGV("Removed trace class 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,19 +317,20 @@ 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;
+		ret = BT_FUNC_STATUS_MEMORY_ERROR;
 		BT_LIB_LOGE("Cannot set trace class's environment entry: "
 			"%![tc-]+T, entry-name=\"%s\"", tc, name);
 	} else {
 		bt_value_freeze(value);
-		BT_LIB_LOGV("Set trace class's environment entry: "
+		BT_LIB_LOGD("Set trace class's environment entry: "
 			"%![tc-]+T, entry-name=\"%s\"", tc, name);
 	}
 
 	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;
@@ -350,7 +353,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;
@@ -360,7 +364,7 @@ enum bt_trace_class_status bt_trace_class_set_environment_entry_integer(
 	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;
+		ret = BT_FUNC_STATUS_MEMORY_ERROR;
 		goto end;
 	}
 
@@ -477,7 +481,7 @@ void bt_trace_class_set_assigns_automatic_stream_class_id(struct bt_trace_class
 	BT_ASSERT_PRE_NON_NULL(tc, "Trace class");
 	BT_ASSERT_PRE_TRACE_CLASS_HOT(tc);
 	tc->assigns_automatic_stream_class_id = (bool) value;
-	BT_LIB_LOGV("Set trace class's automatic stream class ID "
+	BT_LIB_LOGD("Set trace class's automatic stream class ID "
 		"assignment property: %!+T", tc);
 }