ir: consolidate reference counting functions

[babeltrace.git] / formats / ctf / ir / stream.c

diff --git a/formats/ctf/ir/stream.c b/formats/ctf/ir/stream.c
index 70e2ec2a0ab0218d4190955e09a3ceb67dbb3709..298749240dbefa052eb2b6bd5a104512db1ac6bd 100644 (file)
--- a/formats/ctf/ir/stream.c
+++ b/formats/ctf/ir/stream.c
@@ -35,13 +35,15 @@
 #include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/stream-internal.h>
 #include <babeltrace/ctf-ir/stream-class-internal.h>
+#include <babeltrace/ctf-ir/ref.h>
+#include <babeltrace/ctf-ir/common-internal.h>
 #include <babeltrace/ctf-writer/functor-internal.h>
 #include <babeltrace/compiler.h>
 #include <babeltrace/align.h>
 #include <babeltrace/ctf/ctf-index.h>
 
 static
-void bt_ctf_stream_destroy(struct bt_ctf_ref *ref);
+void bt_ctf_stream_destroy(struct bt_ref *ref);
 static
 int set_structure_field_integer(struct bt_ctf_field *, char *, uint64_t);
 
@@ -246,6 +248,13 @@ end:
        return ret;
 }
 
+static
+void put_event(struct bt_ctf_event *event)
+{
+       bt_ctf_event_set_stream(event, NULL);
+       bt_ctf_event_put(event);
+}
+
 BT_HIDDEN
 struct bt_ctf_stream *bt_ctf_stream_create(
        struct bt_ctf_stream_class *stream_class,
@@ -263,8 +272,9 @@ struct bt_ctf_stream *bt_ctf_stream_create(
                goto end;
        }
 
+       /* A stream has no ownership of its trace (weak ptr) */
        stream->trace = trace;
-       bt_ctf_ref_init(&stream->ref_count);
+       bt_ctf_base_init(stream, bt_ctf_stream_destroy);
        stream->packet_context = bt_ctf_field_create(
                stream_class->packet_context_type);
        if (!stream->packet_context) {
@@ -297,7 +307,7 @@ struct bt_ctf_stream *bt_ctf_stream_create(
        stream->stream_class = stream_class;
        bt_ctf_stream_class_get(stream_class);
        stream->events = g_ptr_array_new_with_free_func(
-               (GDestroyNotify) bt_ctf_event_put);
+               (GDestroyNotify) put_event);
        if (!stream->events) {
                goto error_destroy;
        }
@@ -330,7 +340,7 @@ struct bt_ctf_stream *bt_ctf_stream_create(
 end:
        return stream;
 error_destroy:
-       bt_ctf_stream_destroy(&stream->ref_count);
+       bt_ctf_stream_destroy(&stream->base.ref_count);
        return NULL;
 }
 
@@ -350,13 +360,6 @@ end:
        return ret;
 }
 
-BT_HIDDEN
-void bt_ctf_stream_set_trace(struct bt_ctf_stream *stream,
-               struct bt_ctf_trace *trace)
-{
-       stream->trace = trace;
-}
-
 struct bt_ctf_stream_class *bt_ctf_stream_get_class(
                struct bt_ctf_stream *stream)
 {
@@ -510,6 +513,13 @@ int bt_ctf_stream_append_event(struct bt_ctf_stream *stream,
                goto end;
        }
 
+       ret = bt_ctf_event_set_stream(event, stream);
+       if (ret) {
+               /* Event was already associated to a stream */
+               ret = -1;
+               goto end;
+       }
+
        ret = bt_ctf_event_populate_event_header(event);
        if (ret) {
                goto end;
@@ -543,6 +553,9 @@ int bt_ctf_stream_append_event(struct bt_ctf_stream *stream,
                g_ptr_array_add(stream->event_contexts, event_context_copy);
        }
 end:
+       if (ret) {
+               (void) bt_ctf_event_set_stream(event, NULL);
+       }
        return ret;
 }
 
@@ -886,34 +899,28 @@ end:
 
 void bt_ctf_stream_get(struct bt_ctf_stream *stream)
 {
-       if (!stream) {
-               return;
-       }
-
-       bt_ctf_ref_get(&stream->ref_count);
+       bt_ctf_get(stream);
 }
 
 void bt_ctf_stream_put(struct bt_ctf_stream *stream)
 {
-       if (!stream) {
-               return;
-       }
-
-       bt_ctf_ref_put(&stream->ref_count, bt_ctf_stream_destroy);
+       bt_ctf_put(stream);
 }
 
 static
-void bt_ctf_stream_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_stream_destroy(struct bt_ref *ref)
 {
        struct bt_ctf_stream *stream;
+       struct bt_ctf_base *base;
 
        if (!ref) {
                return;
        }
 
-       stream = container_of(ref, struct bt_ctf_stream, ref_count);
+       base = container_of(ref, struct bt_ctf_base, ref_count);
+       stream = container_of(base, struct bt_ctf_stream, base);
        ctf_fini_pos(&stream->pos);
-       if (close(stream->pos.fd)) {
+       if (stream->pos.fd >= 0 && close(stream->pos.fd)) {
                perror("close");
        }