From 0f4eaec3e738fa0f33296a46fe08266a60787c23 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 17 Aug 2012 15:26:59 -0400 Subject: [PATCH] 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 --- include/lttng/ust-abi.h | 6 ++++++ liblttng-ust/lttng-ust-abi.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h index 46a35d80..766a7e6a 100644 --- 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 12b42ea9..61d37ac8 100644 --- 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; } -- 2.34.1