Bump LTTNG_UST_ABI_MAJOR_VERSION to 6

[lttng-tools.git] / src / bin / lttng-sessiond / lttng-ust-abi.h

diff --git a/src/bin/lttng-sessiond/lttng-ust-abi.h b/src/bin/lttng-sessiond/lttng-ust-abi.h
index df61cde57c5c0005bb6e72c7d2ccdcbea4d19c2d..423a0c2e39534392557aa400d421ddaf1accafa9 100644 (file)
--- a/src/bin/lttng-sessiond/lttng-ust-abi.h
+++ b/src/bin/lttng-sessiond/lttng-ust-abi.h
@@ -28,7 +28,9 @@
  */
 
 #include <stdint.h>
-#include <lttng/ust-compiler.h>
+
+#define lttng_ust_notrace __attribute__((no_instrument_function))
+#define LTTNG_PACKED    __attribute__((__packed__))
 
 #ifndef __ust_stringify
 #define __ust_stringify1(x)    #x
@@ -42,7 +44,7 @@
 #define LTTNG_UST_COMM_MAGIC                   0xC57C57C5
 
 /* Version for ABI between liblttng-ust, sessiond, consumerd */
-#define LTTNG_UST_ABI_MAJOR_VERSION            4
+#define LTTNG_UST_ABI_MAJOR_VERSION            6
 #define LTTNG_UST_ABI_MINOR_VERSION            0
 
 enum lttng_ust_instrumentation {
@@ -137,8 +139,16 @@ enum lttng_ust_context_type {
        LTTNG_UST_CONTEXT_VPID                  = 1,
        LTTNG_UST_CONTEXT_PTHREAD_ID            = 2,
        LTTNG_UST_CONTEXT_PROCNAME              = 3,
+       LTTNG_UST_CONTEXT_IP                    = 4,
+       LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER   = 5,
 };
 
+struct lttng_ust_perf_counter_ctx {
+       uint32_t type;
+       uint64_t config;
+       char name[LTTNG_UST_SYM_NAME_LEN];
+} LTTNG_PACKED;
+
 #define LTTNG_UST_CONTEXT_PADDING1     16
 #define LTTNG_UST_CONTEXT_PADDING2     (LTTNG_UST_SYM_NAME_LEN + 32)
 struct lttng_ust_context {
@@ -146,6 +156,7 @@ struct lttng_ust_context {
        char padding[LTTNG_UST_CONTEXT_PADDING1];
 
        union {
+               struct lttng_ust_perf_counter_ctx perf_counter;
                char padding[LTTNG_UST_CONTEXT_PADDING2];
        } u;
 } LTTNG_PACKED;
@@ -155,7 +166,7 @@ struct lttng_ust_context {
  */
 #define LTTNG_UST_CHANNEL_ATTR_PADDING (LTTNG_UST_SYM_NAME_LEN + 32)
 struct lttng_ust_channel_attr {
-       uint64_t subbuf_size;                   /* bytes */
+       uint64_t subbuf_size;                   /* bytes, power of 2 */
        uint64_t num_subbuf;                    /* power of 2 */
        int overwrite;                          /* 1: overwrite, 0: discard */
        unsigned int switch_timer_interval;     /* usec */
@@ -227,6 +238,13 @@ struct lttng_ust_filter_bytecode {
        char data[0];
 } LTTNG_PACKED;
 
+#define LTTNG_UST_EXCLUSION_PADDING    32
+struct lttng_ust_event_exclusion {
+       uint32_t count;
+       char padding[LTTNG_UST_EXCLUSION_PADDING];
+       char names[LTTNG_UST_SYM_NAME_LEN][0];
+} LTTNG_PACKED;
+
 #define _UST_CMD(minor)                                (minor)
 #define _UST_CMDR(minor, type)                 (minor)
 #define _UST_CMDW(minor, type)                 (minor)