X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ftrace.c;h=688a113eb77f41862856c9403a7383455e54ba9b;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=184fc0705f2dd6ea125aad2e73fb23a5748a1cb5;hpb=3c634c8559a62a62f56ba5b28380ab49341dd6a0;p=babeltrace.git

diff --git a/src/lib/trace-ir/trace.c b/src/lib/trace-ir/trace.c
index 184fc070..688a113e 100644
--- a/src/lib/trace-ir/trace.c
+++ b/src/lib/trace-ir/trace.c
@@ -27,13 +27,11 @@
 #include "lib/assert-pre.h"
 #include "lib/assert-post.h"
 #include <babeltrace2/trace-ir/trace.h>
-#include <babeltrace2/trace-ir/trace-const.h>
 #include <babeltrace2/trace-ir/event-class.h>
 #include "ctf-writer/functor.h"
 #include "ctf-writer/clock.h"
 #include "compat/compiler.h"
 #include <babeltrace2/value.h>
-#include <babeltrace2/value-const.h>
 #include "lib/value.h"
 #include <babeltrace2/types.h>
 #include "compat/endian.h"
@@ -42,6 +40,7 @@
 #include <inttypes.h>
 #include <stdint.h>
 #include <string.h>
+#include <stdbool.h>
 #include <stdlib.h>
 
 #include "attributes.h"
@@ -81,6 +80,8 @@ void destroy_trace(struct bt_object *obj)
 	 */
 	if (trace->destruction_listeners) {
 		uint64_t i;
+		const struct bt_error *saved_error;
+
 		BT_LIB_LOGD("Calling trace destruction listener(s): %!+t", trace);
 
 		/*
@@ -95,6 +96,8 @@ void destroy_trace(struct bt_object *obj)
 		*/
 		trace->base.ref_count++;
 
+		saved_error = bt_current_thread_take_error();
+
 		/* Call all the trace destruction listeners */
 		for (i = 0; i < trace->destruction_listeners->len; i++) {
 			struct bt_trace_destruction_listener_elem elem =
@@ -103,6 +106,7 @@ void destroy_trace(struct bt_object *obj)
 
 			if (elem.func) {
 				elem.func(trace, elem.data);
+				BT_ASSERT_POST_NO_ERROR();
 			}
 
 			/*
@@ -113,6 +117,10 @@ void destroy_trace(struct bt_object *obj)
 		}
 		g_array_free(trace->destruction_listeners, TRUE);
 		trace->destruction_listeners = NULL;
+
+		if (saved_error) {
+			BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(saved_error);
+		}
 	}
 
 	if (trace->name.str) {
@@ -148,6 +156,8 @@ struct bt_trace *bt_trace_create(struct bt_trace_class *tc)
 {
 	struct bt_trace *trace = NULL;
 
+	BT_ASSERT_PRE_NO_ERROR();
+
 	BT_LIB_LOGD("Creating trace object: %![tc-]+T", tc);
 	trace = g_new0(struct bt_trace, 1);
 	if (!trace) {
@@ -217,6 +227,7 @@ const char *bt_trace_get_name(const struct bt_trace *trace)
 enum bt_trace_set_name_status bt_trace_set_name(struct bt_trace *trace,
 		const char *name)
 {
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(trace, "Trace");
 	BT_ASSERT_PRE_NON_NULL(name, "Name");
 	BT_ASSERT_PRE_DEV_TRACE_HOT(trace);
@@ -242,7 +253,6 @@ void bt_trace_set_uuid(struct bt_trace *trace, bt_uuid uuid)
 	BT_LIB_LOGD("Set trace's UUID: %!+t", trace);
 }
 
-BT_ASSERT_FUNC
 static
 bool trace_has_environment_entry(const struct bt_trace *trace, const char *name)
 {
@@ -288,9 +298,12 @@ bt_trace_set_environment_entry_string(
 {
 	int ret;
 	struct bt_value *value_obj;
+
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(trace, "Trace");
 	BT_ASSERT_PRE_NON_NULL(name, "Name");
 	BT_ASSERT_PRE_NON_NULL(value, "Value");
+
 	value_obj = bt_value_string_create_init(value);
 	if (!value_obj) {
 		BT_LIB_LOGE_APPEND_CAUSE(
@@ -313,8 +326,11 @@ bt_trace_set_environment_entry_integer(
 {
 	int ret;
 	struct bt_value *value_obj;
+
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(trace, "Trace");
 	BT_ASSERT_PRE_NON_NULL(name, "Name");
+
 	value_obj = bt_value_integer_signed_create_init(value);
 	if (!value_obj) {
 		BT_LIB_LOGE_APPEND_CAUSE(
@@ -333,12 +349,8 @@ end:
 
 uint64_t bt_trace_get_environment_entry_count(const struct bt_trace *trace)
 {
-	int64_t ret;
-
 	BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace");
-	ret = bt_attributes_get_count(trace->environment);
-	BT_ASSERT(ret >= 0);
-	return (uint64_t) ret;
+	return bt_attributes_get_count(trace->environment);
 }
 
 void bt_trace_borrow_environment_entry_by_index_const(
@@ -425,6 +437,7 @@ enum bt_trace_add_listener_status bt_trace_add_destruction_listener(
 		.data = data,
 	};
 
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(trace, "Trace");
 	BT_ASSERT_PRE_NON_NULL(listener, "Listener");
 
@@ -469,6 +482,7 @@ enum bt_trace_remove_listener_status bt_trace_remove_destruction_listener(
 	struct bt_trace *trace = (void *) c_trace;
 	struct bt_trace_destruction_listener_elem *elem;
 
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(trace, "Trace");
 	BT_ASSERT_PRE(has_listener_id(trace, listener_id),
 		"Trace has no such trace destruction listener ID: "