Move lttng_ust_object_data et lttng_ust_channel_attr to -abi.h

[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 7146579129006b45995c1a27283881a1be159698..5b025aeac5b30e6e7a514b9cbe7ffc1f4d99f58f 100644 (file)
--- a/include/ust/lttng-ust-abi.h
+++ b/include/ust/lttng-ust-abi.h
@@ -67,7 +67,9 @@ struct lttng_ust_event {
 
 enum lttng_ust_context_type {
        LTTNG_UST_CONTEXT_VTID                  = 0,
-       LTTNG_UST_CONTEXT_PTHREAD_ID            = 1,
+       LTTNG_UST_CONTEXT_VPID                  = 1,
+       LTTNG_UST_CONTEXT_PTHREAD_ID            = 2,
+       LTTNG_UST_CONTEXT_PROCNAME              = 3,
 };
 
 struct lttng_ust_context {
@@ -76,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)
@@ -109,6 +130,8 @@ struct lttng_ust_context {
 /* Event and Channel FD commands */
 #define LTTNG_UST_CONTEXT                      \
        _UST_CMDW(0x70, struct lttng_ust_context)
+#define LTTNG_UST_FLUSH_BUFFER                 \
+       _UST_CMD(0x71)
 
 /* Event, Channel and Session commands */
 #define LTTNG_UST_ENABLE                       _UST_CMD(0x80)