From fb7ff824ceb33c9b74fa6395a3137d6e73bfd5e7 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 12 May 2021 14:09:00 -0400 Subject: [PATCH] Fix: ust: keep using lttng-ust-sock-8 and lttng-ust-wait-8 filenames MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Replicate a change from a lttng-ust header for which there is an internal copy within lttng-tools for building without lttng-ust. lttng-ust commit 6a359b8a4006 ("Bump LTTNG_UST_ABI version from 8.1 to 9.0") attempted to ensure that a session daemon linked against an old lttng-ust-ctl (2.12) would not attempt to interact with newer applications. This was done by increasing the major ABI version number, but introducing LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE (set to 8) as a mean to allow session daemon to accept both major versions 8 and 9. Unfortunately, changing LTTNG_UST_ABI_MAJOR_VERSION means the filenames used for communication changed as well, meaning that applications linked against older lttng-ust 2.12 cannot interact with lttng sessiond linked against lttng-ust-ctl 2.13, which is unintended. Therefore, go back to using the previous filenames: lttng-ust-sock-8, and lttng-ust-wait-8 for communication. Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau Change-Id: I121c6e5aa13637f13b996dd9e31e06d060b52ca6 --- src/bin/lttng-sessiond/ust-ctl-internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/lttng-sessiond/ust-ctl-internal.h b/src/bin/lttng-sessiond/ust-ctl-internal.h index ff3023380..73d401962 100644 --- a/src/bin/lttng-sessiond/ust-ctl-internal.h +++ b/src/bin/lttng-sessiond/ust-ctl-internal.h @@ -21,7 +21,7 @@ /* Default unix socket path */ #define LTTNG_UST_SOCK_FILENAME \ "lttng-ust-sock-" \ - __ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION) + __ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE) /* * Shared memory files path are automatically related to shm root, e.g. @@ -29,7 +29,7 @@ */ #define LTTNG_UST_WAIT_FILENAME \ "lttng-ust-wait-" \ - __ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION) + __ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE) struct lttng_ust_shm_handle; struct lttng_ust_lib_ring_buffer; -- 2.34.1