lib: rename include dir to babeltrace2

[babeltrace.git] / lib / trace-ir / stream.c

diff --git a/lib/trace-ir/stream.c b/lib/trace-ir/stream.c
index a75aef344b66ee0c23e1e35f9b8cffbed926610d..3af38f32115affb310169dd7119c03a3d8dfbe7b 100644 (file)
--- a/lib/trace-ir/stream.c
+++ b/lib/trace-ir/stream.c
@@ -1,8 +1,7 @@
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -23,22 +22,21 @@
  */
 
 #define BT_LOG_TAG "STREAM"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/trace-ir/stream-const.h>
-#include <babeltrace/trace-ir/stream.h>
-#include <babeltrace/trace-ir/stream-internal.h>
-#include <babeltrace/trace-ir/stream-class.h>
-#include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/trace-ir/trace.h>
-#include <babeltrace/trace-ir/trace-internal.h>
-#include <babeltrace/trace-ir/packet-internal.h>
-#include <babeltrace/object.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/align-internal.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/property-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/trace-ir/stream-const.h>
+#include <babeltrace2/trace-ir/stream.h>
+#include <babeltrace2/trace-ir/stream-internal.h>
+#include <babeltrace2/trace-ir/stream-class.h>
+#include <babeltrace2/trace-ir/stream-class-internal.h>
+#include <babeltrace2/trace-ir/trace.h>
+#include <babeltrace2/trace-ir/trace-internal.h>
+#include <babeltrace2/trace-ir/packet-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/align-internal.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/property-internal.h>
 #include <inttypes.h>
 #include <unistd.h>
 
@@ -110,8 +108,6 @@ struct bt_stream *create_stream_with_id(struct bt_stream_class *stream_class,
                "%![sc-]+S, %![trace-]+t", stream_class, trace);
        BT_ASSERT_PRE(stream_id_is_unique(trace, stream_class, id),
                "Duplicate stream ID: %![trace-]+t, id=%" PRIu64, trace, id);
-       BT_ASSERT_PRE(!trace->is_static,
-               "Trace is static: %![trace-]+t", trace);
        BT_LIB_LOGD("Creating stream object: %![trace-]+t, id=%" PRIu64,
                trace, id);
        stream = g_new0(struct bt_stream, 1);
@@ -205,19 +201,20 @@ const struct bt_trace *bt_stream_borrow_trace_const(
 
 const char *bt_stream_get_name(const struct bt_stream *stream)
 {
-       BT_ASSERT_PRE_NON_NULL(stream, "Stream class");
+       BT_ASSERT_PRE_NON_NULL(stream, "Stream");
        return stream->name.value;
 }
 
-int bt_stream_set_name(struct bt_stream *stream, const char *name)
+enum bt_stream_status bt_stream_set_name(struct bt_stream *stream,
+               const char *name)
 {
-       BT_ASSERT_PRE_NON_NULL(stream, "Clock class");
+       BT_ASSERT_PRE_NON_NULL(stream, "Stream");
        BT_ASSERT_PRE_NON_NULL(name, "Name");
        BT_ASSERT_PRE_STREAM_HOT(stream);
        g_string_assign(stream->name.str, name);
        stream->name.value = stream->name.str->str;
-       BT_LIB_LOGV("Set stream class's name: %!+s", stream);
-       return 0;
+       BT_LIB_LOGV("Set stream's name: %!+s", stream);
+       return BT_STREAM_STATUS_OK;
 }
 
 uint64_t bt_stream_get_id(const struct bt_stream *stream)
@@ -229,8 +226,17 @@ uint64_t bt_stream_get_id(const struct bt_stream *stream)
 BT_HIDDEN
 void _bt_stream_freeze(const struct bt_stream *stream)
 {
-       /* The field classes and default clock class are already frozen */
        BT_ASSERT(stream);
        BT_LIB_LOGD("Freezing stream: %!+s", stream);
        ((struct bt_stream *) stream)->frozen = true;
 }
+
+void bt_stream_get_ref(const struct bt_stream *stream)
+{
+       bt_object_get_ref(stream);
+}
+
+void bt_stream_put_ref(const struct bt_stream *stream)
+{
+       bt_object_put_ref(stream);
+}