From e440301cb0ff25f572f01378f1dbb88d6f0d4e9a Mon Sep 17 00:00:00 2001 From: Bolehu Date: Sat, 7 Jan 2023 00:07:14 +0800 Subject: [PATCH] Fix broken profile command Signed-off-by: Bolehu --- backport-Fix-broken-profile-command.patch | 35 +++++++++++++++++++++++ trace-cmd.spec | 6 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-broken-profile-command.patch diff --git a/backport-Fix-broken-profile-command.patch b/backport-Fix-broken-profile-command.patch new file mode 100644 index 0000000..fd4f62d --- /dev/null +++ b/backport-Fix-broken-profile-command.patch @@ -0,0 +1,35 @@ +From 7e12e8ba4001f51869f28770246f0ac3dbfb9999 Mon Sep 17 00:00:00 2001 +From: "Tzvetomir Stoyanov (VMware)" +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 +Fixes: 1762536da ("trace-cmd: Have tracecmd_read_headers() specify the state to read up to") +Signed-off-by: Tzvetomir Stoyanov (VMware) +Signed-off-by: Steven Rostedt (VMware) +--- + 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 f503bf77..b47b208c 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.33.0 + diff --git a/trace-cmd.spec b/trace-cmd.spec index f4af0f3..a961f52 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -1,6 +1,6 @@ Name: trace-cmd Version: 2.9.2 -Release: 8 +Release: 9 Summary: A front-end for Ftrace License: GPLv2 and LGPLv2 URL: http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary @@ -12,6 +12,7 @@ Patch0002: backport-trace-cmd-library-Fix-version-string-memory-leak.p Patch0003: backport-trace-cmd-library-Fixed-a-memory-leak-on-input-handl.patch Patch0004: backport-Remove-unneeded-multiply-in-events-timesta.patch Patch0005: backport-Changing-default-install-path-of-plugins.patch +Patch0006: backport-Fix-broken-profile-command.patch BuildRequires: gcc xmlto asciidoc mlocate libxml2-devel chrpath BuildRequires: gtk2-devel glib2-devel desktop-file-utils libtraceevent-devel @@ -71,6 +72,9 @@ echo "%{_bindir}/%{name}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.co %{_mandir}/man5/* %changelog +* Mon Jan 09 2023 Bolehu - 2.9.2-9 +- Fix broken profile command + * Sat Jan 07 2023 Bolehu - 2.9.2-8 - Changing default install path of plugins -- Gitee