lib: add aliases for Babeltrace structure types

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

diff --git a/include/babeltrace/trace-ir/trace-const.h b/include/babeltrace/trace-ir/trace-const.h
index 4443056a61e34aa0c8768012c7bbe3a25ae22d59..24f2239431d465b3a877e9e8e16aaf63abee0a3d 100644 (file)
--- a/include/babeltrace/trace-ir/trace-const.h
+++ b/include/babeltrace/trace-ir/trace-const.h
@@ -2,10 +2,9 @@
 #define BABELTRACE_TRACE_IR_TRACE_CONST_H
 
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 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
@@ -28,7 +27,10 @@
  * http://www.efficios.com/ctf
  */
 
-/* For bt_bool, bt_uuid */
+/*
+ * For bt_bool, bt_uuid, bt_trace, bt_stream, bt_stream_class,
+ * bt_field_class, bt_value
+ */
 #include <babeltrace/types.h>
 
 #include <stdint.h>
@@ -37,67 +39,52 @@
 extern "C" {
 #endif
 
-struct bt_trace;
-struct bt_stream;
-struct bt_stream_class;
-struct bt_field_class;
-struct bt_value;
-
-typedef void (* bt_trace_is_static_listener_func)(const struct bt_trace *trace,
+typedef void (* bt_trace_is_static_listener_func)(const bt_trace *trace,
                void *data);
 
-typedef void (* bt_trace_listener_removed_func)(const struct bt_trace *trace,
+typedef void (* bt_trace_listener_removed_func)(const bt_trace *trace,
                void *data);
 
-extern bt_bool bt_trace_assigns_automatic_stream_class_id(
-               const struct bt_trace *trace);
-
-extern const char *bt_trace_get_name(const struct bt_trace *trace);
-
-extern bt_uuid bt_trace_get_uuid(const struct bt_trace *trace);
-
-extern uint64_t bt_trace_get_environment_entry_count(
-               const struct bt_trace *trace);
-
-extern void bt_trace_borrow_environment_entry_by_index_const(
-               const struct bt_trace *trace, uint64_t index,
-               const char **name, const struct bt_value **value);
+extern const bt_trace_class *bt_trace_borrow_class_const(
+               const bt_trace *trace);
 
-extern const struct bt_value *
-bt_trace_borrow_environment_entry_value_by_name_const(
-               const struct bt_trace *trace, const char *name);
+extern const char *bt_trace_get_name(const bt_trace *trace);
 
-extern const struct bt_field_class *
-bt_trace_borrow_packet_header_field_class_const(
-               const struct bt_trace *trace);
+extern uint64_t bt_trace_get_stream_count(const bt_trace *trace);
 
-extern uint64_t bt_trace_get_stream_class_count(const struct bt_trace *trace);
+extern const bt_stream *bt_trace_borrow_stream_by_index_const(
+               const bt_trace *trace, uint64_t index);
 
-extern const struct bt_stream_class *
-bt_trace_borrow_stream_class_by_index_const(const struct bt_trace *trace,
-               uint64_t index);
+extern const bt_stream *bt_trace_borrow_stream_by_id_const(
+               const bt_trace *trace, uint64_t id);
 
-extern const struct bt_stream_class *bt_trace_borrow_stream_class_by_id_const(
-               const struct bt_trace *trace, uint64_t id);
+extern bt_bool bt_trace_is_static(const bt_trace *trace);
 
-extern uint64_t bt_trace_get_stream_count(const struct bt_trace *trace);
-
-extern const struct bt_stream *bt_trace_borrow_stream_by_index_const(
-               const struct bt_trace *trace, uint64_t index);
-
-extern const struct bt_stream *bt_trace_borrow_stream_by_id_const(
-               const struct bt_trace *trace, uint64_t id);
-
-extern bt_bool bt_trace_is_static(const struct bt_trace *trace);
-
-extern int bt_trace_add_is_static_listener(const struct bt_trace *trace,
+extern int bt_trace_add_is_static_listener(const bt_trace *trace,
                bt_trace_is_static_listener_func listener,
                bt_trace_listener_removed_func listener_removed, void *data,
                uint64_t *listener_id);
 
-extern int bt_trace_remove_is_static_listener(const struct bt_trace *trace,
+extern int bt_trace_remove_is_static_listener(const bt_trace *trace,
                uint64_t listener_id);
 
+extern void bt_trace_get_ref(const bt_trace *trace);
+
+extern void bt_trace_put_ref(const bt_trace *trace);
+
+#define BT_TRACE_PUT_REF_AND_RESET(_var)               \
+       do {                                            \
+               bt_trace_put_ref(_var);                 \
+               (_var) = NULL;                          \
+       } while (0)
+
+#define BT_TRACE_MOVE_REF(_var_dst, _var_src)          \
+       do {                                            \
+               bt_trace_put_ref(_var_dst);             \
+               (_var_dst) = (_var_src);                \
+               (_var_src) = NULL;                      \
+       } while (0)
+
 #ifdef __cplusplus
 }
 #endif