1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From 20c3d27fe32b7efd6c61c89d379a440b53f8542c Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 10 Jul 2025 16:41:20 -0400
Subject: [PATCH lttng-tools] fix: liblttng-ctl: stub 'error_log_time' with
CONFIG_RCU_TLS
Change-Id: I95b45e0afb583b53d3ddb700a4e5eea5241f43bb
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
src/lib/lttng-ctl/deprecated-symbols.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/lib/lttng-ctl/deprecated-symbols.cpp b/src/lib/lttng-ctl/deprecated-symbols.cpp
index 518f29a4b..3bcf0061c 100644
--- a/src/lib/lttng-ctl/deprecated-symbols.cpp
+++ b/src/lib/lttng-ctl/deprecated-symbols.cpp
@@ -6,6 +6,7 @@
*/
#include <lttng/lttng-export.h>
+#include <urcu/tls-compat.h>
#include <stddef.h>
@@ -55,7 +56,11 @@ struct log_time {
char str[19];
};
+#ifdef CONFIG_RCU_TLS
LTTNG_EXPORT thread_local struct log_time error_log_time = {};
+#else
+LTTNG_EXPORT const struct log_time *__tls_access_error_log_time = nullptr;
+#endif
#ifdef __cplusplus
}
--
2.47.2
|
