Fix: src.ctf.lttng-live: emitting stream end msg with no stream

[babeltrace.git] / include / babeltrace2 / trace-ir / trace-const.h

diff --git a/include/babeltrace2/trace-ir/trace-const.h b/include/babeltrace2/trace-ir/trace-const.h
index 9662810a3278771f7381e34a72ac80fa9bf2f73a..d4410a2dd1db59977c7ed5e98b9a94fbbe0009e6 100644 (file)
--- a/include/babeltrace2/trace-ir/trace-const.h
+++ b/include/babeltrace2/trace-ir/trace-const.h
@@ -2,8 +2,7 @@
 #define BABELTRACE2_TRACE_IR_TRACE_CONST_H
 
 /*
- * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
- * Copyright 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,24 +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_bool, bt_uuid, bt_trace, bt_stream, bt_stream_class,
- * bt_field_class, bt_value
- */
 #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
@@ -47,6 +38,9 @@ extern "C" {
 typedef void (* bt_trace_destruction_listener_func)(
                const bt_trace *trace, void *data);
 
+extern const bt_value *bt_trace_borrow_user_attributes_const(
+               const bt_trace *trace);
+
 extern const bt_trace_class *bt_trace_borrow_class_const(
                const bt_trace *trace);
 
@@ -79,7 +73,7 @@ typedef enum bt_trace_add_listener_status {
 extern bt_trace_add_listener_status bt_trace_add_destruction_listener(
                const bt_trace *trace,
                bt_trace_destruction_listener_func listener,
-               void *data, uint64_t *listener_id);
+               void *data, bt_listener_id *listener_id);
 
 typedef enum bt_trace_remove_listener_status {
        BT_TRACE_REMOVE_LISTENER_STATUS_MEMORY_ERROR    = __BT_FUNC_STATUS_MEMORY_ERROR,
@@ -87,7 +81,7 @@ typedef enum bt_trace_remove_listener_status {
 } bt_trace_remove_listener_status;
 
 extern bt_trace_remove_listener_status bt_trace_remove_destruction_listener(
-               const bt_trace *trace, uint64_t listener_id);
+               const bt_trace *trace, bt_listener_id listener_id);
 
 extern void bt_trace_get_ref(const bt_trace *trace);
 
@@ -110,6 +104,4 @@ extern void bt_trace_put_ref(const bt_trace *trace);
 }
 #endif
 
-#include <babeltrace2/undef-func-status.h>
-
 #endif /* BABELTRACE2_TRACE_IR_TRACE_CONST_H */