sync code

Signed-off-by: cherry530 <707078654@qq.com>
(cherry picked from commit 23a118ffb4b91259e77f6966373d388ca1e1cafc)

backport-trace-cmd-record-Set-sleep_time-to-zero-at-end-of-re.patch

@@ -0,0 +1,32 @@
+From be207b060775c9841d7e3c1c240e74de63df3040 Mon Sep 17 00:00:00 2001
+From: wangmeiyang <wangmeiyang@xfusion.com>
+Date: Tue, 26 Dec 2023 11:15:29 +0800
+Subject: [PATCH 2/2] trace-cmd record: Set sleep_time to zero at end of
+ recording
+
+When the recording (of trace-cmd record) or streaming (of trace-cmd stream)
+is finished, set sleep_time to zero. This will cause various calls to read
+the buffer to not block, as the sleep_time is used in some instances to
+determine how long to wait if there's no data.
+
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+---
+ tracecmd/trace-record.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
+index 826d1e7..9a7cba2 100644
+--- a/tracecmd/trace-record.c
++++ b/tracecmd/trace-record.c
+@@ -3066,6 +3066,8 @@ static void expand_event_list(void)
+ 
+ static void finish(int sig)
+ {
++	sleep_time = 0;
++
+ 	/* all done */
+ 	if (recorder)
+ 		tracecmd_stop_recording(recorder);
+-- 
+2.37.0.windows.1
+

backport-trace-cmd-stream-Set-default-sleep-time-to-half-a-se.patch

@@ -0,0 +1,31 @@
+From 57e830f5078314a114a34c6512629ff66b9ee590 Mon Sep 17 00:00:00 2001
+From: wangmeiyang <wangmeiyang@xfusion.com>
+Date: Tue, 26 Dec 2023 11:01:29 +0800
+Subject: [PATCH 1/2] trace-cmd stream: Set default sleep time to half a second
+
+When in streaming mode, set the default to half a second instead of 1
+millisecond (which should be changed for record as well).
+
+Link:https://lore.kernel.org/linux-trace-devel/20230106183930.12565-8-rostedt@goodmis.org/
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+---
+ tracecmd/trace-record.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
+index 89a3e76..826d1e7 100644
+--- a/tracecmd/trace-record.c
++++ b/tracecmd/trace-record.c
+@@ -6533,6 +6533,9 @@ void trace_stream(int argc, char **argv)
+ {
+ 	struct common_record_context ctx;
+ 
++	/* Default sleep time is half a second for streaming */
++	sleep_time = 500000;
++
+ 	parse_record_options(argc, argv, CMD_stream, &ctx);
+ 	record_trace(argc, argv, &ctx);
+ 	exit(0);
+-- 
+2.37.0.windows.1
+

trace-cmd.spec

@@ -1,6 +1,6 @@
 Name:                trace-cmd
 Version:             2.9.2
-Release:             9
+Release:             12
 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
@@ -13,6 +13,8 @@ Patch0003:           backport-trace-cmd-library-Fixed-a-memory-leak-on-input-han
 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
+Patch0007:           backport-trace-cmd-stream-Set-default-sleep-time-to-half-a-se.patch
+Patch0008:           backport-trace-cmd-record-Set-sleep_time-to-zero-at-end-of-re.patch
 
 BuildRequires:       gcc xmlto asciidoc mlocate libxml2-devel chrpath
 BuildRequires:       gtk2-devel glib2-devel desktop-file-utils libtraceevent-devel
@@ -72,6 +74,15 @@ echo "%{_bindir}/%{name}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.co
 %{_mandir}/man5/*
 
 %changelog
+* Tue Dec 26 2023 meiyang666 <wangmeiyang@xfusion.com>  - 2.9.2-12
+- Fix spec file
+
+* Tue Dec 26 2023 meiyang666 <wangmeiyang@xfusion.com>  - 2.9.2-11
+- trace-cmd record: Set sleep_time to zero at end of recording
+
+* Tue Dec 26 2023 meiyang666 <wangmeiyang@xfusion.com>  - 2.9.2-10
+- trace-cmd stream: Set default sleep time to half a second
+
 * Mon Jan 09 2023 Bolehu <heyaohua@xfusion.com> - 2.9.2-9
 - Fix broken profile command