[PATCH v1 3/5] libtraceevent: Increase libtraceevent logging when verbose

From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
	Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Anshuman Khandual <anshuman.khandual@arm.com>,
	Andi Kleen <ak@linux.intel.com>,
	James Clark <james.clark@arm.com>,
	Sandipan Das <sandipan.das@amd.com>,
	German Gomez <german.gomez@arm.com>, Leo Yan <leo.yan@linaro.org>,
	Timothy Hayes <timothy.hayes@arm.com>,
	Kan Liang <kan.liang@linux.intel.com>,
	Xing Zhengjun <zhengjun.xing@linux.intel.com>,
	Kim Phillips <kim.phillips@amd.com>,
	Riccardo Mancini <rickyman7@gmail.com>,
	Sean Christopherson <seanjc@google.com>,
	shaomin Deng <dengshaomin@cdjrlc.com>,
	Eelco Chaudron <echaudro@redhat.com>,
	Athira Jajeev <atrajeev@linux.vnet.ibm.com>,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	bpf@vger.kernel.org
Cc: Stephane Eranian <eranian@google.com>, Ian Rogers <irogers@google.com>
Subject: [PATCH v1 3/5] libtraceevent: Increase libtraceevent logging when verbose
Date: Tue, 13 Dec 2022 15:26:49 -0800	[thread overview]
Message-ID: <20221213232651.1269909-4-irogers@google.com> (raw)
In-Reply-To: <20221213232651.1269909-1-irogers@google.com>

libtraceevent has added more levels of debug printout and with changes
like:
https://lore.kernel.org/linux-trace-devel/20210507095022.1079364-3-tz.stoyanov@gmail.com
previously generated output like "registering plugin" is no longer
displayed. This change makes it so that if perf's verbose debug output
is enabled then the debug and info libtraceevent messages can be
displayed.
The code is conditionally enabled based on the libtraceevent version as
discussed in the RFC:
https://lore.kernel.org/lkml/20210610060643.595673-1-irogers@google.com/

Based on previously reverted change:
https://lore.kernel.org/linux-perf-users/20210923001024.550263-4-irogers@google.com/
that was reverted due to -Itools/lib being in CFLAGS meaning the
traceevent headers couldn't be properly used from the system.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/util/debug.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
index 65e6c22f38e4..cd575460818f 100644
--- a/tools/perf/util/debug.c
+++ b/tools/perf/util/debug.c
@@ -22,6 +22,7 @@
 #include "ui/helpline.h"
 #include "ui/ui.h"
 #include "util/parse-sublevel-options.h"
+#include "util/trace-event.h"
 
 #include <linux/ctype.h>
 
@@ -228,6 +229,15 @@ int perf_debug_option(const char *str)
 	/* Allow only verbose value in range (0, 10), otherwise set 0. */
 	verbose = (verbose < 0) || (verbose > 10) ? 0 : verbose;
 
+#if MAKE_LIBTRACEEVENT_VERSION(1, 3, 0) <= LIBTRACEEVENT_VERSION
+	if (verbose == 1)
+		tep_set_loglevel(TEP_LOG_INFO);
+	else if (verbose == 2)
+		tep_set_loglevel(TEP_LOG_DEBUG);
+	else if (verbose >= 3)
+		tep_set_loglevel(TEP_LOG_ALL);
+#endif
+
 	return 0;
 }
 
-- 
2.39.0.314.g84b9a713c41-goog

