Fix: backward compatibility with UST 2.0 app probes

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

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index 46a35d808bed16186056acab404389f93897a740..c9be4bd9d29fda9d8268a8d3531774d253f6e791 100644 (file)
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -23,9 +23,15 @@
 
 #define LTTNG_UST_SYM_NAME_LEN 256
 
+/* Version for comm protocol between sessiond and ust */
 #define LTTNG_UST_COMM_VERSION_MAJOR           2
 #define LTTNG_UST_COMM_VERSION_MINOR           0
 
+/* Version for ABI between liblttng-ust, sessiond, consumerd */
+#define LTTNG_UST_INTERNAL_MAJOR_VERSION       3
+#define LTTNG_UST_INTERNAL_MINOR_VERSION       0
+#define LTTNG_UST_INTERNAL_PATCHLEVEL_VERSION  0
+
 enum lttng_ust_instrumentation {
        LTTNG_UST_TRACEPOINT            = 0,
        LTTNG_UST_PROBE                 = 1,
@@ -93,12 +99,13 @@ enum lttng_ust_field_type {
        LTTNG_UST_FIELD_STRING                  = 4,
 };
 
-#define LTTNG_UST_FIELD_ITER_PADDING           LTTNG_UST_SYM_NAME_LEN + 32
+#define LTTNG_UST_FIELD_ITER_PADDING           LTTNG_UST_SYM_NAME_LEN + 28
 struct lttng_ust_field_iter {
        char event_name[LTTNG_UST_SYM_NAME_LEN];
        char field_name[LTTNG_UST_SYM_NAME_LEN];
        enum lttng_ust_field_type type;
        int loglevel;                           /* event loglevel */
+       int nowrite;
        char padding[LTTNG_UST_FIELD_ITER_PADDING];
 };
 
@@ -165,10 +172,10 @@ struct lttng_ust_calibrate {
        } u;
 };
 
-#define FILTER_BYTECODE_MAX_LEN                65535
+#define FILTER_BYTECODE_MAX_LEN                65536
 struct lttng_ust_filter_bytecode {
-       uint16_t len;
-       uint16_t reloc_offset;
+       uint32_t len;
+       uint32_t reloc_offset;
        char data[0];
 };