Message ID | 20210729155805.2830-2-james.clark@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | perf tools: Warning fixes | expand |
Em Thu, Jul 29, 2021 at 04:58:00PM +0100, James Clark escreveu: > Currently WARN_ONCE prints to stderr and corrupts the TUI. Add > equivalent methods for UI warnings. This one and the the next 3 seem clean and useful, applying and then waiting for people to comment on the coresight specific ones. - Arnaldo > Signed-off-by: James Clark <james.clark@arm.com> > --- > tools/perf/util/debug.h | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h > index 48f631966067..f99468a7f681 100644 > --- a/tools/perf/util/debug.h > +++ b/tools/perf/util/debug.h > @@ -22,6 +22,13 @@ extern int debug_data_convert; > eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__) > #define pr_warning(fmt, ...) \ > eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__) > +#define pr_warning_once(fmt, ...) ({ \ > + static int __warned; \ > + if (unlikely(!__warned)) { \ > + pr_warning(fmt, ##__VA_ARGS__); \ > + __warned = 1; \ > + } \ > +}) > #define pr_info(fmt, ...) \ > eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__) > #define pr_debug(fmt, ...) \ > @@ -55,6 +62,13 @@ void trace_event(union perf_event *event); > > int ui__error(const char *format, ...) __printf(1, 2); > int ui__warning(const char *format, ...) __printf(1, 2); > +#define ui__warning_once(format, ...) ({ \ > + static int __warned; \ > + if (unlikely(!__warned)) { \ > + ui__warning(format, ##__VA_ARGS__); \ > + __warned = 1; \ > + } \ > +}) > > void pr_stat(const char *fmt, ...); > > -- > 2.28.0 >
diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h index 48f631966067..f99468a7f681 100644 --- a/tools/perf/util/debug.h +++ b/tools/perf/util/debug.h @@ -22,6 +22,13 @@ extern int debug_data_convert; eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__) #define pr_warning(fmt, ...) \ eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__) +#define pr_warning_once(fmt, ...) ({ \ + static int __warned; \ + if (unlikely(!__warned)) { \ + pr_warning(fmt, ##__VA_ARGS__); \ + __warned = 1; \ + } \ +}) #define pr_info(fmt, ...) \ eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__) #define pr_debug(fmt, ...) \ @@ -55,6 +62,13 @@ void trace_event(union perf_event *event); int ui__error(const char *format, ...) __printf(1, 2); int ui__warning(const char *format, ...) __printf(1, 2); +#define ui__warning_once(format, ...) ({ \ + static int __warned; \ + if (unlikely(!__warned)) { \ + ui__warning(format, ##__VA_ARGS__); \ + __warned = 1; \ + } \ +}) void pr_stat(const char *fmt, ...);
Currently WARN_ONCE prints to stderr and corrupts the TUI. Add equivalent methods for UI warnings. Signed-off-by: James Clark <james.clark@arm.com> --- tools/perf/util/debug.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)