Standardize version across toolchain

[lttng-modules.git] / lttng-events.c

diff --git a/lttng-events.c b/lttng-events.c
index a01d0af849e69a8ef3a4dc7cb33fa69ae167c981..a062044698b95e218f2fcb05b41cec8170e33cd6 100644 (file)
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -113,6 +113,11 @@ int lttng_session_enable(struct lttng_session *session)
        ACCESS_ONCE(session->active) = 1;
        ACCESS_ONCE(session->been_active) = 1;
        ret = _lttng_session_metadata_statedump(session);
+       if (ret) {
+               ACCESS_ONCE(session->active) = 0;
+               goto end;
+       }
+       ret = lttng_statedump_start(session);
        if (ret)
                ACCESS_ONCE(session->active) = 0;
 end:
@@ -927,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"
@@ -941,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;