Fix trace-cmd profile
Resolves: rhbz#1978504 Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
This commit is contained in:
parent
2a70484123
commit
04def3daa9
35
trace-cmd-Fix-broken-profile-command.patch
Normal file
35
trace-cmd-Fix-broken-profile-command.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From 7e12e8ba4001f51869f28770246f0ac3dbfb9999 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
|
||||||
|
Date: Fri, 14 May 2021 10:52:41 +0300
|
||||||
|
Subject: [PATCH] trace-cmd: Fix broken profile command
|
||||||
|
|
||||||
|
Recent changes in creating trace.dat files broke the streams, used
|
||||||
|
internaly by the trace-cmd profile command.
|
||||||
|
|
||||||
|
Link: https://lore.kernel.org/linux-trace-devel/20210514075241.65418-1-tz.stoyanov@gmail.com
|
||||||
|
|
||||||
|
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=213045
|
||||||
|
Reported-by: Jerome Marchand <jmarchan@redhat.com>
|
||||||
|
Fixes: 1762536da ("trace-cmd: Have tracecmd_read_headers() specify the state to read up to")
|
||||||
|
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
|
||||||
|
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
|
||||||
|
---
|
||||||
|
tracecmd/trace-stream.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tracecmd/trace-stream.c b/tracecmd/trace-stream.c
|
||||||
|
index f503bf7..b47b208 100644
|
||||||
|
--- a/tracecmd/trace-stream.c
|
||||||
|
+++ b/tracecmd/trace-stream.c
|
||||||
|
@@ -59,7 +59,7 @@ trace_stream_init(struct buffer_instance *instance, int cpu, int fd, int cpus,
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (tracecmd_read_headers(trace_input, 0) < 0)
|
||||||
|
+ if (tracecmd_read_headers(trace_input, TRACECMD_FILE_PRINTK) < 0)
|
||||||
|
goto fail_free_input;
|
||||||
|
|
||||||
|
if (handle_init)
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Name: trace-cmd
|
Name: trace-cmd
|
||||||
Version: %{srcversion}
|
Version: %{srcversion}
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
License: GPLv2 and LGPLv2
|
License: GPLv2 and LGPLv2
|
||||||
Summary: A user interface to Ftrace
|
Summary: A user interface to Ftrace
|
||||||
Requires: libtracecmd
|
Requires: libtracecmd
|
||||||
@ -19,6 +19,8 @@ URL: http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary
|
|||||||
# cd trace-cmd
|
# cd trace-cmd
|
||||||
# git archive --prefix=trace-cmd-%%{version}/ -o trace-cmd-v%%{version}.tar.gz %%{git_commit}
|
# git archive --prefix=trace-cmd-%%{version}/ -o trace-cmd-v%%{version}.tar.gz %%{git_commit}
|
||||||
Source0: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v%{srcversion}.tar.gz
|
Source0: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v%{srcversion}.tar.gz
|
||||||
|
Patch0: trace-cmd-Fix-broken-profile-command.patch
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: xmlto
|
BuildRequires: xmlto
|
||||||
@ -64,7 +66,7 @@ Requires: libtracecmd%{_isa} = %{version}-%{release}
|
|||||||
Development files of the libtracecmd library
|
Development files of the libtracecmd library
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-v%{srcversion}
|
%autosetup -p1 -n %{name}-v%{srcversion}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# MANPAGE_DOCBOOK_XSL define is hack to avoid using locate
|
# MANPAGE_DOCBOOK_XSL define is hack to avoid using locate
|
||||||
@ -111,6 +113,9 @@ mkdir -p %{buildroot}/%{_sysconfdir}
|
|||||||
%{_includedir}/trace-cmd
|
%{_includedir}/trace-cmd
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 11 2021 Jerome Marchand <jmarchan@redhat.com> - 2.9.2-6
|
||||||
|
- Fix trace-cmd profile
|
||||||
|
|
||||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.9.2-5
|
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.9.2-5
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
Related: rhbz#1991688
|
Related: rhbz#1991688
|
||||||
|
Loading…
Reference in New Issue
Block a user