aboutsummaryrefslogtreecommitdiffstats
path: root/tracecmd
diff options
context:
space:
mode:
authorSteven Rostedt (Google) <rostedt@goodmis.org>2022-10-06 19:06:21 -0400
committerSteven Rostedt (Google) <rostedt@goodmis.org>2022-10-18 18:40:42 -0400
commit51ae62947e0821c399ab248ba7925bbb6daebfed (patch)
treee88421ab329ddef0ba37034c31db506d00434615 /tracecmd
parent9c4c57389156ecc758d685ee4096ccd10e504022 (diff)
downloadtrace-cmd-51ae62947e0821c399ab248ba7925bbb6daebfed.tar.gz
trace-cmd library: Only set trace-cmd log level
Have tracecmd_set_loglevel() only for trace-cmd and not touch libtracefs and libtraceevent log levels. Let the application handle this instead. Update the trace-cmd code to keep the same reporting. Move the updates of libtracefs and libtraceevent log levels from the library into the application. Link: https://lore.kernel.org/linux-trace-devel/20221006190621.46bbb606@gandalf.local.home Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Diffstat (limited to 'tracecmd')
-rw-r--r--tracecmd/include/trace-local.h1
-rw-r--r--tracecmd/trace-cmd.c11
-rw-r--r--tracecmd/trace-read.c2
3 files changed, 12 insertions, 2 deletions
diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h
index a48a14a5..023afb3b 100644
--- a/tracecmd/include/trace-local.h
+++ b/tracecmd/include/trace-local.h
@@ -40,6 +40,7 @@ void usage(char **argv);
extern int silence_warnings;
extern int show_status;
+void trace_set_loglevel(int level);
int trace_set_verbose(char *level);
enum port_type {
diff --git a/tracecmd/trace-cmd.c b/tracecmd/trace-cmd.c
index 69800d26..9646921c 100644
--- a/tracecmd/trace-cmd.c
+++ b/tracecmd/trace-cmd.c
@@ -76,6 +76,13 @@ static struct trace_log_severity {
{ .id = TEP_LOG_ALL, .name = "all" },
};
+void trace_set_loglevel(int level)
+{
+ tracecmd_set_loglevel(level);
+ tracefs_set_loglevel(level);
+ tep_set_loglevel(level);
+}
+
int trace_set_verbose(char *level)
{
int id;
@@ -89,7 +96,7 @@ int trace_set_verbose(char *level)
if (id >= TEP_LOG_NONE) {
if (id > TEP_LOG_ALL)
id = TEP_LOG_ALL;
- tracecmd_set_loglevel(id);
+ trace_set_loglevel(id);
return 0;
}
} else {
@@ -98,7 +105,7 @@ int trace_set_verbose(char *level)
for (i = 0; i < size; i++) {
if (!strncmp(level, log_severity[i].name, strlen(log_severity[i].name))) {
- tracecmd_set_loglevel(log_severity[i].id);
+ trace_set_loglevel(log_severity[i].id);
return 0;
}
}
diff --git a/tracecmd/trace-read.c b/tracecmd/trace-read.c
index b8931cf9..d51e3371 100644
--- a/tracecmd/trace-read.c
+++ b/tracecmd/trace-read.c
@@ -1565,6 +1565,8 @@ void trace_report (int argc, char **argv)
signal(SIGINT, sig_end);
+ trace_set_loglevel(TEP_LOG_INFO);
+
for (;;) {
int option_index = 0;
static struct option long_options[] = {