Add lttng_ust prefix before struct obj and struct objd_ops

[lttng-ust.git] / include / ust / lttng-ust-abi.h

diff --git a/include/ust/lttng-ust-abi.h b/include/ust/lttng-ust-abi.h
index 5eb131f8feae510410881964bab28d85dacf700a..9c2a53dc2b2a69dcf6741b9b67f1bc5f6b853f46 100644 (file)
--- a/include/ust/lttng-ust-abi.h
+++ b/include/ust/lttng-ust-abi.h
@@ -78,6 +78,25 @@ struct lttng_ust_context {
        } u;
 };
 
+/*
+ * Tracer channel attributes.
+ */
+struct lttng_ust_channel_attr {
+       int overwrite;                          /* 1: overwrite, 0: discard */
+       uint64_t subbuf_size;                   /* bytes */
+       uint64_t num_subbuf;                    /* power of 2 */
+       unsigned int switch_timer_interval;     /* usec */
+       unsigned int read_timer_interval;       /* usec */
+       enum lttng_ust_output output;           /* splice, mmap */
+};
+
+struct lttng_ust_object_data {
+       int handle;
+       int shm_fd;
+       int wait_fd;
+       uint64_t memory_map_size;
+};
+
 #define _UST_CMD(minor)                                (minor)
 #define _UST_CMDR(minor, type)                 (minor)
 #define _UST_CMDW(minor, type)                 (minor)
@@ -111,7 +130,7 @@ struct lttng_ust_context {
 /* Event and Channel FD commands */
 #define LTTNG_UST_CONTEXT                      \
        _UST_CMDW(0x70, struct lttng_ust_context)
-#define LTTNG_UST_FLUSH_BUFFERS                        \
+#define LTTNG_UST_FLUSH_BUFFER                 \
        _UST_CMD(0x71)
 
 /* Event, Channel and Session commands */
@@ -120,9 +139,9 @@ struct lttng_ust_context {
 
 #define LTTNG_UST_ROOT_HANDLE  0
 
-struct obj;
+struct lttng_ust_obj;
 
-struct objd_ops {
+struct lttng_ust_objd_ops {
        long (*cmd)(int objd, unsigned int cmd, unsigned long arg);
        int (*release)(int objd);
 };
@@ -130,10 +149,10 @@ struct objd_ops {
 /* Create root handle. Always ID 0. */
 int lttng_abi_create_root_handle(void);
 
-const struct objd_ops *objd_ops(int id);
+const struct lttng_ust_objd_ops *objd_ops(int id);
 int objd_unref(int id);
 
 void lttng_ust_abi_exit(void);
-void ltt_events_exit(void);
+void lttng_ust_events_exit(void);
 
 #endif /* _LTTNG_UST_ABI_H */