X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ftrace.c;h=b7fca04bc23705f3ce615e15d5e6a548baa6d2e8;hb=870631a2db01676b476dbee615aade0a22926bcd;hp=6dadb10d4aed37b053a4b3b00b7a92b78ce2b29e;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/lib/trace-ir/trace.c b/src/lib/trace-ir/trace.c
index 6dadb10d..b7fca04b 100644
--- a/src/lib/trace-ir/trace.c
+++ b/src/lib/trace-ir/trace.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.h>
@@ -55,6 +55,7 @@
 #include "trace-class.h"
 #include "trace.h"
 #include "utils.h"
+#include "lib/func-status.h"
 
 struct bt_trace_destruction_listener_elem {
 	bt_trace_destruction_listener_func func;
@@ -77,7 +78,7 @@ void destroy_trace(struct bt_object *obj)
 	 */
 	if (trace->destruction_listeners) {
 		uint64_t i;
-		BT_LIB_LOGV("Calling trace destruction listener(s): %!+t", trace);
+		BT_LIB_LOGD("Calling trace destruction listener(s): %!+t", trace);
 
 		/*
 		* The trace's reference count is 0 if we're here. Increment
@@ -141,7 +142,7 @@ struct bt_trace *bt_trace_create(struct bt_trace_class *tc)
 	BT_LIB_LOGD("Creating trace object: %![tc-]+T", tc);
 	trace = g_new0(struct bt_trace, 1);
 	if (!trace) {
-		BT_LOGE_STR("Failed to allocate one trace.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one trace.");
 		goto error;
 	}
 
@@ -149,27 +150,27 @@ struct bt_trace *bt_trace_create(struct bt_trace_class *tc)
 	trace->streams = g_ptr_array_new_with_free_func(
 		(GDestroyNotify) bt_object_try_spec_release);
 	if (!trace->streams) {
-		BT_LOGE_STR("Failed to allocate one GPtrArray.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray.");
 		goto error;
 	}
 
 	trace->stream_classes_stream_count = g_hash_table_new(g_direct_hash,
 		g_direct_equal);
 	if (!trace->stream_classes_stream_count) {
-		BT_LOGE_STR("Failed to allocate one GHashTable.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GHashTable.");
 		goto error;
 	}
 
 	trace->name.str = g_string_new(NULL);
 	if (!trace->name.str) {
-		BT_LOGE_STR("Failed to allocate one GString.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GString.");
 		goto error;
 	}
 
 	trace->destruction_listeners = g_array_new(FALSE, TRUE,
 		sizeof(struct bt_trace_destruction_listener_elem));
 	if (!trace->destruction_listeners) {
-		BT_LOGE_STR("Failed to allocate one GArray.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GArray.");
 		goto error;
 	}
 
@@ -191,15 +192,16 @@ const char *bt_trace_get_name(const struct bt_trace *trace)
 	return trace->name.value;
 }
 
-enum bt_trace_status bt_trace_set_name(struct bt_trace *trace, const char *name)
+enum bt_trace_set_name_status bt_trace_set_name(struct bt_trace *trace,
+		const char *name)
 {
 	BT_ASSERT_PRE_NON_NULL(trace, "Trace");
 	BT_ASSERT_PRE_NON_NULL(name, "Name");
 	BT_ASSERT_PRE_TRACE_HOT(trace);
 	g_string_assign(trace->name.str, name);
 	trace->name.value = trace->name.str->str;
-	BT_LIB_LOGV("Set trace's name: %!+t", trace);
-	return BT_TRACE_STATUS_OK;
+	BT_LIB_LOGD("Set trace's name: %!+t", trace);
+	return BT_FUNC_STATUS_OK;
 }
 
 uint64_t bt_trace_get_stream_count(const struct bt_trace *trace)
@@ -250,7 +252,7 @@ const struct bt_stream *bt_trace_borrow_stream_by_id_const(
 	return bt_trace_borrow_stream_by_id((void *) trace, id);
 }
 
-enum bt_trace_status bt_trace_add_destruction_listener(
+enum bt_trace_add_listener_status bt_trace_add_destruction_listener(
 		const struct bt_trace *c_trace,
 		bt_trace_destruction_listener_func listener,
 		void *data, uint64_t *listener_id)
@@ -286,9 +288,9 @@ enum bt_trace_status bt_trace_add_destruction_listener(
 		*listener_id = i;
 	}
 
-	BT_LIB_LOGV("Added destruction listener: " "%![trace-]+t, "
+	BT_LIB_LOGD("Added destruction listener: " "%![trace-]+t, "
 			"listener-id=%" PRIu64, trace, i);
-	return BT_TRACE_STATUS_OK;
+	return BT_FUNC_STATUS_OK;
 }
 
 BT_ASSERT_PRE_FUNC
@@ -301,7 +303,7 @@ bool has_listener_id(const struct bt_trace *trace, uint64_t listener_id)
 			listener_id))->func != NULL;
 }
 
-enum bt_trace_status bt_trace_remove_destruction_listener(
+enum bt_trace_remove_listener_status bt_trace_remove_destruction_listener(
 		const struct bt_trace *c_trace, uint64_t listener_id)
 {
 	struct bt_trace *trace = (void *) c_trace;
@@ -318,10 +320,10 @@ enum bt_trace_status bt_trace_remove_destruction_listener(
 
 	elem->func = NULL;
 	elem->data = NULL;
-	BT_LIB_LOGV("Removed \"trace destruction listener: "
+	BT_LIB_LOGD("Removed \"trace destruction listener: "
 		"%![trace-]+t, listener-id=%" PRIu64,
 		trace, listener_id);
-	return BT_TRACE_STATUS_OK;
+	return BT_FUNC_STATUS_OK;
 }
 
 BT_HIDDEN