mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
perf debug: Expose debug file
Some dumping call backs need to be passed a FILE*. Expose debug file via an accessor API for a consistent way to do this. Catch the unlikely failure of it not being set. Switch two cases where stderr was being used instead of debug_file. Signed-off-by: Ian Rogers <irogers@google.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Cc: Changbin Du <changbin.du@huawei.com> Cc: Colin Ian King <colin.i.king@gmail.com> Cc: Dmitrii Dolgov <9erthalion6@gmail.com> Cc: German Gomez <german.gomez@arm.com> Cc: Guilherme Amadio <amadio@gentoo.org> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@arm.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: K Prateek Nayak <kprateek.nayak@amd.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Li Dong <lidong@vivo.com> Cc: Liam Howlett <liam.howlett@oracle.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Miguel Ojeda <ojeda@kernel.org> Cc: Ming Wang <wangming01@loongson.cn> Cc: Nick Terrell <terrelln@fb.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Sandipan Das <sandipan.das@amd.com> Cc: Sean Christopherson <seanjc@google.com> Cc: Steinar H. Gunderson <sesse@google.com> Cc: Vincent Whitchurch <vincent.whitchurch@axis.com> Cc: Wenyu Liu <liuwenyu7@huawei.com> Cc: Yang Jihong <yangjihong1@huawei.com> Link: https://lore.kernel.org/r/20231207011722.1220634-16-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
8d5847a617
commit
ec49230cf6
2 changed files with 16 additions and 7 deletions
|
@ -38,12 +38,21 @@ bool dump_trace = false, quiet = false;
|
|||
int debug_ordered_events;
|
||||
static int redirect_to_stderr;
|
||||
int debug_data_convert;
|
||||
static FILE *debug_file;
|
||||
static FILE *_debug_file;
|
||||
bool debug_display_time;
|
||||
|
||||
FILE *debug_file(void)
|
||||
{
|
||||
if (!_debug_file) {
|
||||
pr_warning_once("debug_file not set");
|
||||
debug_set_file(stderr);
|
||||
}
|
||||
return _debug_file;
|
||||
}
|
||||
|
||||
void debug_set_file(FILE *file)
|
||||
{
|
||||
debug_file = file;
|
||||
_debug_file = file;
|
||||
}
|
||||
|
||||
void debug_set_display_time(bool set)
|
||||
|
@ -78,8 +87,8 @@ int veprintf(int level, int var, const char *fmt, va_list args)
|
|||
if (use_browser >= 1 && !redirect_to_stderr) {
|
||||
ui_helpline__vshow(fmt, args);
|
||||
} else {
|
||||
ret = fprintf_time(debug_file);
|
||||
ret += vfprintf(debug_file, fmt, args);
|
||||
ret = fprintf_time(debug_file());
|
||||
ret += vfprintf(debug_file(), fmt, args);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -107,9 +116,8 @@ static int veprintf_time(u64 t, const char *fmt, va_list args)
|
|||
nsecs -= secs * NSEC_PER_SEC;
|
||||
usecs = nsecs / NSEC_PER_USEC;
|
||||
|
||||
ret = fprintf(stderr, "[%13" PRIu64 ".%06" PRIu64 "] ",
|
||||
secs, usecs);
|
||||
ret += vfprintf(stderr, fmt, args);
|
||||
ret = fprintf(debug_file(), "[%13" PRIu64 ".%06" PRIu64 "] ", secs, usecs);
|
||||
ret += vfprintf(debug_file(), fmt, args);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -77,6 +77,7 @@ int eprintf_time(int level, int var, u64 t, const char *fmt, ...) __printf(4, 5)
|
|||
int veprintf(int level, int var, const char *fmt, va_list args);
|
||||
|
||||
int perf_debug_option(const char *str);
|
||||
FILE *debug_file(void);
|
||||
void debug_set_file(FILE *file);
|
||||
void debug_set_display_time(bool set);
|
||||
void perf_debug_setup(void);
|
||||
|
|
Loading…
Reference in a new issue