X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Ftrace.c;h=da8d7d75fcc14a89a5a052e7b15124e7408dda42;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=792d89f73389d427aed273ec92c8b3ebcca5636e;hpb=ad5268b5815118fd5f01551b43e493214528f88d;p=babeltrace.git

diff --git a/lib/trace-ir/trace.c b/lib/trace-ir/trace.c
index 792d89f7..da8d7d75 100644
--- a/lib/trace-ir/trace.c
+++ b/lib/trace-ir/trace.c
@@ -22,34 +22,34 @@
  */
 
 #define BT_LOG_TAG "TRACE"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/trace-ir/trace.h>
-#include <babeltrace/trace-ir/trace-class-internal.h>
-#include <babeltrace/trace-ir/trace-const.h>
-#include <babeltrace/trace-ir/trace-internal.h>
-#include <babeltrace/trace-ir/clock-class-internal.h>
-#include <babeltrace/trace-ir/stream-internal.h>
-#include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/trace-ir/event-internal.h>
-#include <babeltrace/trace-ir/event-class.h>
-#include <babeltrace/trace-ir/event-class-internal.h>
-#include <babeltrace/ctf-writer/functor-internal.h>
-#include <babeltrace/ctf-writer/clock-internal.h>
-#include <babeltrace/trace-ir/field-wrapper-internal.h>
-#include <babeltrace/trace-ir/field-class-internal.h>
-#include <babeltrace/trace-ir/attributes-internal.h>
-#include <babeltrace/trace-ir/utils-internal.h>
-#include <babeltrace/trace-ir/resolve-field-path-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/value.h>
-#include <babeltrace/value-const.h>
-#include <babeltrace/value-internal.h>
-#include <babeltrace/types.h>
-#include <babeltrace/endian-internal.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/compat/glib-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/trace-ir/trace.h>
+#include <babeltrace2/trace-ir/trace-class-internal.h>
+#include <babeltrace2/trace-ir/trace-const.h>
+#include <babeltrace2/trace-ir/trace-internal.h>
+#include <babeltrace2/trace-ir/clock-class-internal.h>
+#include <babeltrace2/trace-ir/stream-internal.h>
+#include <babeltrace2/trace-ir/stream-class-internal.h>
+#include <babeltrace2/trace-ir/event-internal.h>
+#include <babeltrace2/trace-ir/event-class.h>
+#include <babeltrace2/trace-ir/event-class-internal.h>
+#include <babeltrace2/ctf-writer/functor-internal.h>
+#include <babeltrace2/ctf-writer/clock-internal.h>
+#include <babeltrace2/trace-ir/field-wrapper-internal.h>
+#include <babeltrace2/trace-ir/field-class-internal.h>
+#include <babeltrace2/trace-ir/attributes-internal.h>
+#include <babeltrace2/trace-ir/utils-internal.h>
+#include <babeltrace2/trace-ir/resolve-field-path-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/value.h>
+#include <babeltrace2/value-const.h>
+#include <babeltrace2/value-internal.h>
+#include <babeltrace2/types.h>
+#include <babeltrace2/endian-internal.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/compat/glib-internal.h>
 #include <inttypes.h>
 #include <stdint.h>
 #include <string.h>
@@ -77,6 +77,19 @@ void destroy_trace(struct bt_object *obj)
 	if (trace->destruction_listeners) {
 		uint64_t i;
 		BT_LIB_LOGV("Calling trace destruction listener(s): %!+t", trace);
+
+		/*
+		* The trace's reference count is 0 if we're here. Increment
+		* it to avoid a double-destroy (possibly infinitely recursive).
+		* This could happen for example if a destruction listener did
+		* bt_object_get_ref() (or anything that causes
+		* bt_object_get_ref() to be called) on the trace (ref.
+		* count goes from 0 to 1), and then bt_object_put_ref(): the
+		* reference count would go from 1 to 0 again and this function
+		* would be called again.
+		*/
+		trace->base.ref_count++;
+
 		/* Call all the trace destruction listeners */
 		for (i = 0; i < trace->destruction_listeners->len; i++) {
 			struct bt_trace_destruction_listener_elem elem =
@@ -86,6 +99,12 @@ void destroy_trace(struct bt_object *obj)
 			if (elem.func) {
 				elem.func(trace, elem.data);
 			}
+
+			/*
+			 * The destruction listener should not have kept a
+			 * reference to the trace.
+			 */
+			BT_ASSERT_PRE(trace->base.ref_count == 1, "Destruction listener kept a reference to the trace being destroyed: %![trace-]+t", trace);
 		}
 		g_array_free(trace->destruction_listeners, TRUE);
 		trace->destruction_listeners = NULL;