ABI change: bump internal version to 3.0.0

We keep compatiblity with applications (so we're still in the 2.x
versions), but we are breaking compatibility with lttng-consumerd.
Therefore, push the internal version number to 3.0.0.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index 46a35d808bed16186056acab404389f93897a740..766a7e6a9b11c3f85844dffa2378f0c47d0c4cca 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,

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 12b42ea9b0a1d335b0a937330ab24c4806d11e1d..61d37ac8b172fc0f99c3eaef958640b8e1ee0a1a 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -263,9 +263,9 @@ static
 long lttng_abi_tracer_version(int objd,
        struct lttng_ust_tracer_version *v)
 {
-       v->major = LTTNG_UST_MAJOR_VERSION;
-       v->minor = LTTNG_UST_MINOR_VERSION;
-       v->patchlevel = LTTNG_UST_PATCHLEVEL_VERSION;
+       v->major = LTTNG_UST_INTERNAL_MAJOR_VERSION;
+       v->minor = LTTNG_UST_INTERNAL_MINOR_VERSION;
+       v->patchlevel = LTTNG_UST_INTERNAL_PATCHLEVEL_VERSION;
        return 0;
 }