#include "lib/logging.h"
#include "lib/assert-pre.h"
+#include "lib/assert-post.h"
#include <babeltrace2/trace-ir/trace-class.h>
-#include <babeltrace2/trace-ir/trace-class-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"
#include <inttypes.h>
#include <stdint.h>
#include <string.h>
+#include <stdbool.h>
#include <stdlib.h>
#include "clock-class.h"
*/
if (tc->destruction_listeners) {
uint64_t i;
+ const struct bt_error *saved_error;
+
BT_LIB_LOGD("Calling trace class destruction listener(s): %!+T", tc);
/*
*/
tc->base.ref_count++;
+ saved_error = bt_current_thread_take_error();
+
/* Call all the trace class destruction listeners */
for (i = 0; i < tc->destruction_listeners->len; i++) {
struct bt_trace_class_destruction_listener_elem elem =
if (elem.func) {
elem.func(tc, elem.data);
+ BT_ASSERT_POST_NO_ERROR();
}
/*
* The destruction listener should not have kept a
* reference to the trace class.
*/
- BT_ASSERT_PRE(tc->base.ref_count == 1, "Destruction listener kept a reference to the trace class being destroyed: %![tc-]+T", tc);
+ BT_ASSERT_POST(tc->base.ref_count == 1, "Destruction listener kept a reference to the trace class being destroyed: %![tc-]+T", tc);
}
g_array_free(tc->destruction_listeners, TRUE);
tc->destruction_listeners = NULL;
+
+ if (saved_error) {
+ BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(saved_error);
+ }
}
if (tc->stream_classes) {
{
struct bt_trace_class *tc = NULL;
+ BT_ASSERT_PRE_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(self_comp, "Self component");
BT_LOGD_STR("Creating default trace class object.");
tc = g_new0(struct bt_trace_class, 1);
.data = data,
};
+ BT_ASSERT_PRE_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(tc, "Trace class");
BT_ASSERT_PRE_NON_NULL(listener, "Listener");
struct bt_trace_class *tc = (void *) _tc;
struct bt_trace_class_destruction_listener_elem *elem;
+ BT_ASSERT_PRE_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(tc, "Trace class");
BT_ASSERT_PRE(has_listener_id(tc, listener_id),
"Trace class has no such trace class destruction listener ID: "
BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
"User attributes object is not a map value object.");
BT_ASSERT_PRE_DEV_TRACE_CLASS_HOT(trace_class);
- bt_object_put_no_null_check(trace_class->user_attributes);
+ bt_object_put_ref_no_null_check(trace_class->user_attributes);
trace_class->user_attributes = (void *) user_attributes;
- bt_object_get_no_null_check(trace_class->user_attributes);
+ bt_object_get_ref_no_null_check(trace_class->user_attributes);
}
void bt_trace_class_get_ref(const struct bt_trace_class *trace_class)