tracing/tools: Updates for 6.11
Steven Rostedt
maintainercover tracing/tools: Updates for 6.11
In honor of Daniel, I pulled down his repo and noticed that he had a for-next branch that he has not pushed out yet. So I just took his branch directly, and will be adding it to the linux-trace.git tree. It is mostly trivial changes.
git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.gittools/for-next
Head SHA1: 28beb730ee167e505c86d1a8ae239e97d0136b13
Daniel Wagner (1):
tools: build: use correct lib name for libtracefs feature detection
Luis Claudio R. Goncalves (2):
rtla/osnoise: Use pretty formatting only on interactive tty rtla/osnoise: Better report when histogram is empty
----
tools/build/feature/Makefile | 2 +- tools/build/feature/test-libtracefs.c | 2 +- tools/tracing/rtla/src/osnoise_hist.c | 15 +++++++++++++++ tools/tracing/rtla/src/osnoise_top.c | 19 +++++++++++++++---- 4 files changed, 32 insertions(+), 6 deletions(-)
Steven Rostedt
maintainerPATCH 1/3 rtla/osnoise: Use pretty formatting only on interactive tty
From: "Luis Claudio R. Goncalves" <[email protected]>
osnoise top performs background/font color formatting that could make the text output confusing if not on a terminal. Use the changes from commit f5c0cdad6684a ("rtla/timerlat: Use pretty formatting only on interactive tty") as an inspiration to fix this problem.
Apply the formatting only if running on a tty, and not in quiet mode.
--- tools/tracing/rtla/src/osnoise_top.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
tools/tracing/rtla/src/osnoise_top.c +15 -4
@@ -42,6 +42,7 @@ struct osnoise_top_params {int hk_cpus;int warmup;int buffer_size; +int pretty_output;cpu_set_t hk_cpu_set;struct sched_attr sched_param;struct trace_events *events;
@@ -163,7 +164,9 @@ static void osnoise_top_header(struct osnoise_tool *top)get_duration (top->start_time, duration,sizeof (duration)); -trace_seq_printf (s,"\033[2;37;40m" ); +if (params->pretty_output) +trace_seq_printf (s,"\033[2;37;40m" ); +trace_seq_printf (s," " );if (params->mode ==MODE_OSNOISE ) {
@@ -174,12 +177,16 @@ static void osnoise_top_header(struct osnoise_tool *top) }trace_seq_printf (s," " ); -trace_seq_printf (s,"\033[0;0;0m" ); + +if (params->pretty_output) +trace_seq_printf (s,"\033[0;0;0m" );trace_seq_printf (s,"\n" );trace_seq_printf (s,"duration: %9s | time is in us\n" , duration); -trace_seq_printf (s,"\033[2;30;47m" ); +if (params->pretty_output) +trace_seq_printf (s,"\033[2;30;47m" ); +trace_seq_printf (s,"CPU Period Runtime " );trace_seq_printf (s," Noise " );trace_seq_printf (s," %% CPU Aval " );
@@ -192,7 +199,8 @@ static void osnoise_top_header(struct osnoise_tool *top)trace_seq_printf (s," IRQ Softirq Thread" ); eol: -trace_seq_printf (s,"\033[0;0;0m" ); +if (params->pretty_output) +trace_seq_printf (s,"\033[0;0;0m" );trace_seq_printf (s,"\n" ); }
@@ -619,6 +627,9 @@ osnoise_top_apply_config(struct osnoise_tool *tool, struct osnoise_top_params *pauto_house_keeping (¶ms->monitored_cpus); } +if (isatty (1 ) && !params->quiet) + params->pretty_output =1 ; +return 0 ; out_err:
Signature · 1 line
2.43.0
Steven Rostedt
maintainerPATCH 2/3 rtla/osnoise: Better report when histogram is empty
In reply to Steven RostedtFrom: "Luis Claudio R. Goncalves" <[email protected]>
When osnoise hist does not observe any samples above the threshold, no entries are recorded and the final report shows empty entries for the usual statistics (count, min, max, avg):
[~]# osnoise hist -d 5s -T 500
# RTLA osnoise histogram
# Time unit is microseconds (us)
# Duration: 0 00:00:05
Index
over:
count:
min:
avg:
max:
That could lead users to confusing interpretations of the results.
A simple solution is to report 0 for count and the statistics, making it clear that no noise (above the defined threshold) was observed:
[~]# osnoise hist -d 5s -T 500
# RTLA osnoise histogram
# Time unit is microseconds (us)
# Duration: 0 00:00:05
Index
over: 0
count: 0
min: 0
avg: 0
max: 0--- tools/tracing/rtla/src/osnoise_hist.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
tools/tracing/rtla/src/osnoise_hist.c +15 -0
@@ -374,6 +374,7 @@ osnoise_print_stats(struct osnoise_hist_params *params, struct osnoise_tool *too {struct osnoise_hist_data *data = tool->data;struct trace_instance *trace = &tool->trace; +int has_samples =0 ;int bucket, cpu;int total;
@@ -402,11 +403,25 @@ osnoise_print_stats(struct osnoise_hist_params *params, struct osnoise_tool *toocontinue ; } +/* There are samples above the threshold */ + has_samples =1 ;trace_seq_printf (trace->seq,"\n" );trace_seq_do_printf (trace->seq);trace_seq_reset (trace->seq); } +/* +* If no samples were recorded, skip calculations, print zeroed statistics +* and return. +*/ +if (!has_samples) { +trace_seq_reset (trace->seq); +trace_seq_printf (trace->seq,"over: 0\ncount: 0\nmin: 0\navg: 0\nmax: 0\n" ); +trace_seq_do_printf (trace->seq); +trace_seq_reset (trace->seq); +return ; + } +if (!params->no_index)trace_seq_printf (trace->seq,"over: " );
Signature · 1 line
2.43.0
Steven Rostedt
maintainerPATCH 3/3 tools: build: use correct lib name for libtracefs feature detection
In reply to Steven RostedtFrom: Daniel Wagner <[email protected]>
Use libtracefs as package name to lookup the CFLAGS for libtracefs. This makes it possible to use the distro specific path as include path for the header file.
--- tools/build/feature/Makefile | 2 +- tools/build/feature/test-libtracefs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/build/feature/Makefile +1 -1
@@ -213,7 +213,7 @@ $(OUTPUT)test-libtraceevent.bin: $(BUILD) -ltraceevent $(OUTPUT)test-libtracefs.bin: - $(BUILD) $(shell $(PKG_CONFIG) --cflags libtraceevent 2>/dev/null) -ltracefs + $(BUILD) $(shell $(PKG_CONFIG) --cflags libtracefs 2>/dev/null) -ltracefs $(OUTPUT)test-libcrypto.bin: $(BUILD) -lcrypto
tools/build/feature/test-libtracefs.c +1 -1
@@ -1,5 +1,5 @@// SPDX-License-Identifier: GPL-2.0 -#include <tracefs/tracefs.h> +#include <tracefs.h> int main (void ) {
Signature · 1 line
2.43.0