Standardize version across toolchain

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

diff --git a/lttng-abi.c b/lttng-abi.c
index 98f03c3e4fbbd552f85d813ca020ca745596b552..7fa303a9fa9e2356a77cb9a8bd363b510258ea54 100644 (file)
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -135,9 +135,9 @@ long lttng_abi_tracer_version(struct file *file,
 {
        struct lttng_kernel_tracer_version v;
 
-       v.version = LTTNG_VERSION;
-       v.patchlevel = LTTNG_PATCHLEVEL;
-       v.sublevel = LTTNG_SUBLEVEL;
+       v.major = LTTNG_MODULES_MAJOR_VERSION;
+       v.minor = LTTNG_MODULES_MINOR_VERSION;
+       v.patchlevel = LTTNG_MODULES_PATCHLEVEL_VERSION;
 
        if (copy_to_user(uversion_param, &v, sizeof(v)))
                return -EFAULT;

diff --git a/lttng-abi.h b/lttng-abi.h
index fecf0ad1c663d044edf0f9609c7cb321b8d4319e..48f76f206a34c33c2075e9b6c68e54a46f348099 100644 (file)
--- a/lttng-abi.h
+++ b/lttng-abi.h
@@ -87,9 +87,9 @@ struct lttng_kernel_event {
 };
 
 struct lttng_kernel_tracer_version {
-       uint32_t version;
+       uint32_t major;
+       uint32_t minor;
        uint32_t patchlevel;
-       uint32_t sublevel;
 };
 
 enum lttng_kernel_calibrate_type {

diff --git a/lttng-events.c b/lttng-events.c
index a3758229c745ef53fa0929d766fc95dce8d66bec..a062044698b95e218f2fcb05b41cec8170e33cd6 100644 (file)
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -932,8 +932,8 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
                lttng_alignof(uint16_t) * CHAR_BIT,
                lttng_alignof(uint32_t) * CHAR_BIT,
                lttng_alignof(uint64_t) * CHAR_BIT,
-               CTF_VERSION_MAJOR,
-               CTF_VERSION_MINOR,
+               CTF_SPEC_MAJOR,
+               CTF_SPEC_MINOR,
                uuid_s,
 #ifdef __BIG_ENDIAN
                "be"
@@ -946,15 +946,21 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
 
        ret = lttng_metadata_printf(session,
                "env {\n"
-               "       domain = \"%s\";\n"
+               "       domain = \"kernel\";\n"
                "       sysname = \"%s\";\n"
-               "       release = \"%s\";\n"
-               "       version = \"%s\";\n"
+               "       kernel_release = \"%s\";\n"
+               "       kernel_version = \"%s\";\n"
+               "       tracer_name = \"lttng-modules\";\n"
+               "       tracer_major = %d;\n"
+               "       tracer_minor = %d;\n"
+               "       tracer_patchlevel = %d;\n"
                "};\n\n",
-               "kernel",
                utsname()->sysname,
                utsname()->release,
-               utsname()->version
+               utsname()->version,
+               LTTNG_MODULES_MAJOR_VERSION,
+               LTTNG_MODULES_MINOR_VERSION,
+               LTTNG_MODULES_PATCHLEVEL_VERSION
                );
        if (ret)
                goto end;

diff --git a/lttng-tracer.h b/lttng-tracer.h
index 99c8f087adc7e2a477b2edf2e2d1ac6d963bbc9e..cafd8d24448394442f20f523a4c43cbb5d079f63 100644 (file)
--- a/lttng-tracer.h
+++ b/lttng-tracer.h
@@ -25,9 +25,9 @@
 #include "lttng-tracer-core.h"
 #include "lttng-events.h"
 
-#define LTTNG_VERSION 1
-#define LTTNG_PATCHLEVEL 9
-#define LTTNG_SUBLEVEL 9
+#define LTTNG_MODULES_MAJOR_VERSION 2
+#define LTTNG_MODULES_MINOR_VERSION 0
+#define LTTNG_MODULES_PATCHLEVEL_VERSION 0
 
 #ifndef CHAR_BIT
 #define CHAR_BIT 8
@@ -51,10 +51,6 @@
 #define CTF_SPEC_MAJOR                 1
 #define CTF_SPEC_MINOR                 8
 
-/* Tracer major/minor versions */
-#define CTF_VERSION_MAJOR              0
-#define CTF_VERSION_MINOR              1
-
 /*
  * Number of milliseconds to retry before failing metadata writes on buffer full
  * condition. (10 seconds)