lib: add aliases for Babeltrace structure types

[babeltrace.git] / include / babeltrace / graph / port-output-notification-iterator.h

diff --git a/include/babeltrace/graph/port-output-notification-iterator.h b/include/babeltrace/graph/port-output-notification-iterator.h
index edf0da0ae6543fb39c53d690af9593d320e48d6f..ceec9141055d31829a4d1b32bad3bece24f49e92 100644 (file)
--- a/include/babeltrace/graph/port-output-notification-iterator.h
+++ b/include/babeltrace/graph/port-output-notification-iterator.h
@@ -2,7 +2,7 @@
 #define BABELTRACE_GRAPH_PORT_OUTPUT_NOTIFICATION_ITERATOR_H
 
 /*
- * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
+ * Copyright 2017-2018 Philippe Proulx <pproulx@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
@@ -28,38 +28,54 @@
 /* For enum bt_notification_iterator_status */
 #include <babeltrace/graph/notification-iterator.h>
 
-/* For bt_notification_array_const */
-#include <babeltrace/graph/notification-const.h>
+/*
+ * For bt_port, bt_notification, bt_notification_iterator,
+ * bt_port_output_notification_iterator, bt_graph, bt_port_output,
+ * bt_notification_array_const
+ */
+#include <babeltrace/types.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_port;
-struct bt_notification;
-struct bt_notification_iterator;
-struct bt_port_output_notification_iterator;
-struct bt_graph;
-struct bt_port_output;
-
 static inline
-struct bt_notification_iterator *
+bt_notification_iterator *
 bt_port_output_notification_iterator_as_notification_iterator(
-               struct bt_port_output_notification_iterator *iterator)
+               bt_port_output_notification_iterator *iterator)
 {
        return (void *) iterator;
 }
 
-extern struct bt_port_output_notification_iterator *
+extern bt_port_output_notification_iterator *
 bt_port_output_notification_iterator_create(
-               struct bt_graph *graph,
-               const struct bt_port_output *output_port);
+               bt_graph *graph,
+               const bt_port_output *output_port);
 
 extern enum bt_notification_iterator_status
 bt_port_output_notification_iterator_next(
-               struct bt_port_output_notification_iterator *iterator,
+               bt_port_output_notification_iterator *iterator,
                bt_notification_array_const *notifs, uint64_t *count);
 
+extern void bt_port_output_notification_iterator_get_ref(
+               const bt_port_output_notification_iterator *port_output_notification_iterator);
+
+extern void bt_port_output_notification_iterator_put_ref(
+               const bt_port_output_notification_iterator *port_output_notification_iterator);
+
+#define BT_PORT_OUTPUT_NOTIFICATION_ITERATOR_PUT_REF_AND_RESET(_var)   \
+       do {                                                            \
+               bt_port_output_notification_iterator_put_ref(_var);     \
+               (_var) = NULL;                                          \
+       } while (0)
+
+#define BT_PORT_OUTPUT_NOTIFICATION_ITERATOR_MOVE_REF(_var_dst, _var_src) \
+       do {                                                            \
+               bt_port_output_notification_iterator_put_ref(_var_dst); \
+               (_var_dst) = (_var_src);                                \
+               (_var_src) = NULL;                                      \
+       } while (0)
+
 #ifdef __cplusplus
 }
 #endif