rtla: Stop the record trace on interrupt

Before, when rtla got a signal, it stopped the main trace but not the
record trace.  With "--on-end trace", this can lead to
save_trace_to_file() failing to keep up, especially on a debug kernel.
Plus, it adds post-stoppage noise to the trace file.

Signed-off-by: Crystal Wood <crwood@redhat.com>
Fixes: c73cab9dbe ("rtla/timerlat_hist: Stop timerlat tracer on signal")
Fixes: a4dfce7559 ("rtla/timerlat_top: Stop timerlat tracer on signal")
Fixes: 3aadb65db5 ("rtla/timerlat: Add action on end feature")
Link: https://lore.kernel.org/r/20260512173731.2151841-1-crwood@redhat.com
Signed-off-by: Tomas Glozar <tglozar@redhat.com>
This commit is contained in:
Crystal Wood 2026-05-12 12:37:31 -05:00 committed by Tomas Glozar
parent e5d8f22758
commit f03a59f949
3 changed files with 12 additions and 10 deletions

View File

@ -10,7 +10,7 @@
#include "common.h"
struct trace_instance *trace_inst;
struct osnoise_tool *trace_tool;
volatile int stop_tracing;
int nr_cpus;
@ -21,12 +21,16 @@ static void stop_trace(int sig)
* Stop requested twice in a row; abort event processing and
* exit immediately
*/
tracefs_iterate_stop(trace_inst->inst);
if (trace_tool)
tracefs_iterate_stop(trace_tool->trace.inst);
return;
}
stop_tracing = 1;
if (trace_inst)
trace_instance_stop(trace_inst);
if (trace_tool) {
trace_instance_stop(&trace_tool->trace);
if (trace_tool->record)
trace_instance_stop(&trace_tool->record->trace);
}
}
/*
@ -273,11 +277,10 @@ int run_tool(struct tool_ops *ops, int argc, char *argv[])
tool->params = params;
/*
* Save trace instance into global variable so that SIGINT can stop
* the timerlat tracer.
* Expose the tool to signal handlers so they can stop the trace.
* Otherwise, rtla could loop indefinitely when overloaded.
*/
trace_inst = &tool->trace;
trace_tool = tool;
retval = ops->apply_config(tool);
if (retval) {
@ -285,7 +288,7 @@ int run_tool(struct tool_ops *ops, int argc, char *argv[])
goto out_free;
}
retval = enable_tracer_by_name(trace_inst->inst, ops->tracer);
retval = enable_tracer_by_name(tool->trace.inst, ops->tracer);
if (retval) {
err_msg("Failed to enable %s tracer\n", ops->tracer);
goto out_free;

View File

@ -54,7 +54,6 @@ struct osnoise_context {
int opt_workload;
};
extern struct trace_instance *trace_inst;
extern volatile int stop_tracing;
struct hist_params {

View File

@ -202,7 +202,7 @@ void timerlat_analyze(struct osnoise_tool *tool, bool stopped)
* If the trace did not stop with --aa-only, at least print
* the max known latency.
*/
max_lat = tracefs_instance_file_read(trace_inst->inst, "tracing_max_latency", NULL);
max_lat = tracefs_instance_file_read(tool->trace.inst, "tracing_max_latency", NULL);
if (max_lat) {
printf(" Max latency was %s\n", max_lat);
free(max_lat);