Compare commits
10 Commits
e11299da46
...
408157072d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
408157072d | ||
|
|
372fc5f925 | ||
|
|
f8069460f5 | ||
|
|
f139c6f648 | ||
|
|
b1bb2305c0 | ||
|
|
aef839c2cf | ||
|
|
81e7d4b596 | ||
|
|
ac440606c5 | ||
|
|
565109ed14 | ||
|
|
0c2bc80926 |
@ -1,89 +0,0 @@
|
|||||||
From 717dc80e36ed544d70a4ff445b3cac9735c0b360 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Jeanson <mjeanson@efficios.com>
|
|
||||||
Date: Mon, 3 Jun 2019 11:07:25 -0400
|
|
||||||
Subject: [PATCH] Fix: namespace our gettid wrapper
|
|
||||||
|
|
||||||
Since glibc 2.30, a gettid wrapper was added that conflicts with our
|
|
||||||
static declaration. Namespace our wrapper so there is no conflict,
|
|
||||||
we'll add support for the glibc provided wrapper in a further commit.
|
|
||||||
|
|
||||||
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
|
|
||||||
---
|
|
||||||
include/lttng/ust-tid.h | 12 +++++++-----
|
|
||||||
include/usterr-signal-safe.h | 2 +-
|
|
||||||
liblttng-ust/lttng-context-vtid.c | 4 ++--
|
|
||||||
3 files changed, 10 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/include/lttng/ust-tid.h b/include/lttng/ust-tid.h
|
|
||||||
index e669d7e7..e637718a 100644
|
|
||||||
--- a/include/lttng/ust-tid.h
|
|
||||||
+++ b/include/lttng/ust-tid.h
|
|
||||||
@@ -31,23 +31,25 @@
|
|
||||||
#include <syscall.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#if defined(_syscall0)
|
|
||||||
-_syscall0(pid_t, gettid)
|
|
||||||
-#elif defined(__NR_gettid)
|
|
||||||
+#if defined(__NR_gettid)
|
|
||||||
+
|
|
||||||
#include <unistd.h>
|
|
||||||
-static inline pid_t gettid(void)
|
|
||||||
+static inline pid_t lttng_gettid(void)
|
|
||||||
{
|
|
||||||
return syscall(__NR_gettid);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
#else
|
|
||||||
+
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
/* Fall-back on getpid for tid if not available. */
|
|
||||||
-static inline pid_t gettid(void)
|
|
||||||
+static inline pid_t lttng_gettid(void)
|
|
||||||
{
|
|
||||||
return getpid();
|
|
||||||
}
|
|
||||||
+
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _LTTNG_UST_TID_H */
|
|
||||||
diff --git a/include/usterr-signal-safe.h b/include/usterr-signal-safe.h
|
|
||||||
index 1df5ada0..d987c1f0 100644
|
|
||||||
--- a/include/usterr-signal-safe.h
|
|
||||||
+++ b/include/usterr-signal-safe.h
|
|
||||||
@@ -95,7 +95,7 @@ do { \
|
|
||||||
do { \
|
|
||||||
sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" UST_XSTR(__LINE__) ")\n", \
|
|
||||||
(long) getpid(), \
|
|
||||||
- (long) gettid(), \
|
|
||||||
+ (long) lttng_gettid(), \
|
|
||||||
## args, __func__); \
|
|
||||||
} while(0)
|
|
||||||
|
|
||||||
diff --git a/liblttng-ust/lttng-context-vtid.c b/liblttng-ust/lttng-context-vtid.c
|
|
||||||
index f28e470a..2f721fa0 100644
|
|
||||||
--- a/liblttng-ust/lttng-context-vtid.c
|
|
||||||
+++ b/liblttng-ust/lttng-context-vtid.c
|
|
||||||
@@ -62,7 +62,7 @@ void vtid_record(struct lttng_ctx_field *field,
|
|
||||||
struct lttng_channel *chan)
|
|
||||||
{
|
|
||||||
if (caa_unlikely(!URCU_TLS(cached_vtid)))
|
|
||||||
- URCU_TLS(cached_vtid) = gettid();
|
|
||||||
+ URCU_TLS(cached_vtid) = lttng_gettid();
|
|
||||||
lib_ring_buffer_align_ctx(ctx, lttng_alignof(URCU_TLS(cached_vtid)));
|
|
||||||
chan->ops->event_write(ctx, &URCU_TLS(cached_vtid),
|
|
||||||
sizeof(URCU_TLS(cached_vtid)));
|
|
||||||
@@ -73,7 +73,7 @@ void vtid_get_value(struct lttng_ctx_field *field,
|
|
||||||
struct lttng_ctx_value *value)
|
|
||||||
{
|
|
||||||
if (caa_unlikely(!URCU_TLS(cached_vtid)))
|
|
||||||
- URCU_TLS(cached_vtid) = gettid();
|
|
||||||
+ URCU_TLS(cached_vtid) = lttng_gettid();
|
|
||||||
value->u.s64 = URCU_TLS(cached_vtid);
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.22.0.rc2
|
|
||||||
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
From 20e138a4e4bab0b06a99662637e808a027cd3d2e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Jeanson <mjeanson@efficios.com>
|
|
||||||
Date: Mon, 2 Nov 2020 15:27:21 +0800
|
|
||||||
Subject: [PATCH] fix lttng-gen-tp
|
|
||||||
|
|
||||||
https://src.fedoraproject.org/rpms/lttng-ust/blob/20e138a4e4bab0b06a99662637e808a027cd3d2e/f/lttng-gen-tp-shebang.patch
|
|
||||||
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
|
|
||||||
---
|
|
||||||
tools/lttng-gen-tp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp
|
|
||||||
index 6aa1bba..fd6c8ba 100755
|
|
||||||
--- a/tools/lttng-gen-tp
|
|
||||||
+++ b/tools/lttng-gen-tp
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/usr/bin/env python
|
|
||||||
+#!/usr/bin/python3
|
|
||||||
#
|
|
||||||
# Copyright (c) 2012 Yannick Brosseau <yannick.brosseau@gmail.com>
|
|
||||||
#
|
|
||||||
Binary file not shown.
BIN
lttng-ust-2.13.7.tar.bz2
Normal file
BIN
lttng-ust-2.13.7.tar.bz2
Normal file
Binary file not shown.
@ -1,16 +1,18 @@
|
|||||||
Name: lttng-ust
|
Name: lttng-ust
|
||||||
Version: 2.10.1
|
Version: 2.13.7
|
||||||
Release: 9
|
Release: 1
|
||||||
Summary: LTTng Userspace Tracer library
|
Summary: LTTng Userspace Tracer library
|
||||||
License: LGPLv2 and GPLv2 and MIT
|
License: LGPLv2 and GPLv2 and MIT
|
||||||
URL: https://lttng.org
|
URL: https://lttng.org
|
||||||
|
|
||||||
Source0: https://lttng.org/files/lttng-ust/%{name}-%{version}.tar.bz2
|
Source0: https://lttng.org/files/lttng-ust/%{name}-%{version}.tar.bz2
|
||||||
Patch0: Fix-namespace-our-gettid-wrapper.patch
|
|
||||||
Patch1: lttng-gen-tp-shebang.patch
|
|
||||||
|
|
||||||
BuildRequires: libuuid-devel autoconf automake libtool
|
BuildRequires: libuuid-devel autoconf automake libtool
|
||||||
BuildRequires: userspace-rcu-devel >= 0.8.0
|
BuildRequires: userspace-rcu-devel >= 0.8.0
|
||||||
|
BuildRequires: numactl-devel
|
||||||
|
BuildRequires: asciidoc
|
||||||
|
BuildRequires: xmlto
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This library is used by user-space applications to generate trace-points using LTTng.
|
This library is used by user-space applications to generate trace-points using LTTng.
|
||||||
@ -60,6 +62,33 @@ make check
|
|||||||
%{_docdir}/%{name}/*
|
%{_docdir}/%{name}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 24 2024 liuchao <liuchao173@huawei.com> - 2.13.7-1
|
||||||
|
- Update to 2.13.7:
|
||||||
|
- fix: invoke MKDIR_P before changing directories
|
||||||
|
- fix: -Wsingle-bit-bitfield-constant-conversion with clang16
|
||||||
|
- fix: clean java inner class files in examples
|
||||||
|
- Introduce sync vs unsync enablers
|
||||||
|
- Fix: misaligned urcu reader accesses
|
||||||
|
- ustfork: Fix warning about volatile qualifier
|
||||||
|
- ustfork: Fix possible race conditions
|
||||||
|
- Fix: tracepoint: Remove trailing \ at the end of macro
|
||||||
|
- fix: python agent: use stdlib distutils when setuptools is installed
|
||||||
|
- fix: python agent: install on Debian python >= 3.10
|
||||||
|
- fix: python agent: Add a dependency on generated files
|
||||||
|
- python: use setuptools with python >= 3.12
|
||||||
|
|
||||||
|
* Fri Aug 25 2023 sunhui <sunhui@kylinos.cn> - 2.13.6-1
|
||||||
|
- Update package to version 2.13.6
|
||||||
|
|
||||||
|
* Mon Jan 30 2023 Wenyu Liu <liuwenyu7@huawei.com> - 2.13.5-1
|
||||||
|
- Update to 2.13.5
|
||||||
|
|
||||||
|
* Mon Dec 20 2021 zhouwenpei <zhouwenpei1@huawei.com> - 2.10.1-11
|
||||||
|
- fix build error
|
||||||
|
|
||||||
|
* Fri Jul 30 2021 zhouwenpei <zhouwenpei1@huawei.com> - 2.10.1-10
|
||||||
|
- fix build with -fno-common
|
||||||
|
|
||||||
* Mon Nov 02 2020 xinghe <xinghe1@huawei.com> - 2.10.1-9
|
* Mon Nov 02 2020 xinghe <xinghe1@huawei.com> - 2.10.1-9
|
||||||
- fix lttng-gen-tp command
|
- fix lttng-gen-tp command
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user