X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Fstream.h;h=416e42cec15c4c128d09a97622f80846b579fdb1;hb=7b6afccb24b31e2feed787c2ed97809e797c3070;hp=ec0edf79bc52f80c96b8ec968ca92752d4250802;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/include/babeltrace2/trace-ir/stream.h b/include/babeltrace2/trace-ir/stream.h
index ec0edf79..416e42ce 100644
--- a/include/babeltrace2/trace-ir/stream.h
+++ b/include/babeltrace2/trace-ir/stream.h
@@ -1,9 +1,8 @@
-#ifndef BABELTRACE_TRACE_IR_STREAM_H
-#define BABELTRACE_TRACE_IR_STREAM_H
+#ifndef BABELTRACE2_TRACE_IR_STREAM_H
+#define BABELTRACE2_TRACE_IR_STREAM_H
 
 /*
- * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
- * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (c) 2010-2019 EfficiOS Inc. and Linux Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,21 +21,16 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * The Common Trace Format (CTF) Specification is available at
- * http://www.efficios.com/ctf
  */
 
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
+
 #include <stdint.h>
 
-/* For bt_trace, bt_stream, bt_stream_class */
 #include <babeltrace2/types.h>
 
-/* For __BT_FUNC_STATUS_* */
-#define __BT_FUNC_STATUS_ENABLE
-#include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -48,6 +42,11 @@ extern bt_stream *bt_stream_create_with_id(
 		bt_stream_class *stream_class,
 		bt_trace *trace, uint64_t id);
 
+extern bt_value *bt_stream_borrow_user_attributes(bt_stream *stream);
+
+extern void bt_stream_set_user_attributes(
+		bt_stream *stream, const bt_value *user_attributes);
+
 extern bt_trace *bt_stream_borrow_trace(bt_stream *stream);
 
 extern bt_stream_class *bt_stream_borrow_class(bt_stream *stream);
@@ -64,6 +63,4 @@ extern bt_stream_set_name_status bt_stream_set_name(bt_stream *stream,
 }
 #endif
 
-#include <babeltrace2/undef-func-status.h>
-
-#endif /* BABELTRACE_TRACE_IR_STREAM_H */
+#endif /* BABELTRACE2_TRACE_IR_STREAM_H */