p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libperf: Merge libperf_set_print() into libperf_init() 

The libperf_set_print() function needs to be called in any case so let's
merge it with libperf_init(), so we have just one init function.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-34-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2019-08-31 20:44:13 +02:00 committed by Arnaldo Carvalho de Melo
parent fb4bf51fcc
commit 428dab813a
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/perf/lib/core.c
View File

@ -17,11 +17,6 @@ static int __base_pr(enum libperf_print_level level, const char *format,
static libperf_print_fn_t __libperf_pr = __base_pr; static libperf_print_fn_t __libperf_pr = __base_pr;
void libperf_set_print(libperf_print_fn_t fn)
{
__libperf_pr = fn;
}
__printf(2, 3) __printf(2, 3)
void libperf_print(enum libperf_print_level level, const char *format, ...) void libperf_print(enum libperf_print_level level, const char *format, ...)
{ {
@ -35,7 +30,8 @@ void libperf_print(enum libperf_print_level level, const char *format, ...)
va_end(args); va_end(args);
} }
void libperf_init(void) void libperf_init(libperf_print_fn_t fn)
{ {
page_size = sysconf(_SC_PAGE_SIZE); page_size = sysconf(_SC_PAGE_SIZE);
__libperf_pr = fn;
} }

3
tools/perf/lib/include/perf/core.h
View File

@ -17,7 +17,6 @@ enum libperf_print_level {
typedef int (*libperf_print_fn_t)(enum libperf_print_level level, typedef int (*libperf_print_fn_t)(enum libperf_print_level level,
const char *, va_list ap); const char *, va_list ap);
LIBPERF_API void libperf_set_print(libperf_print_fn_t fn); LIBPERF_API void libperf_init(libperf_print_fn_t fn);
LIBPERF_API void libperf_init(void);
#endif /* __LIBPERF_CORE_H */ #endif /* __LIBPERF_CORE_H */

1
tools/perf/lib/libperf.map
View File

@ -1,7 +1,6 @@
LIBPERF_0.0.1 { LIBPERF_0.0.1 {
global: global:
libperf_init; libperf_init;
libperf_set_print;
perf_cpu_map__dummy_new; perf_cpu_map__dummy_new;
perf_cpu_map__get; perf_cpu_map__get;
perf_cpu_map__put; perf_cpu_map__put;

8
tools/perf/perf.c
View File

@ -430,6 +430,12 @@ void pthread__unblock_sigwinch(void)
pthread_sigmask(SIG_UNBLOCK, &set, NULL); pthread_sigmask(SIG_UNBLOCK, &set, NULL);
} }
static int libperf_print(enum libperf_print_level level,
const char *fmt, va_list ap)
{
return eprintf(level, verbose, fmt, ap);
}
int main(int argc, const char **argv) int main(int argc, const char **argv)
{ {
int err; int err;
@ -440,7 +446,7 @@ int main(int argc, const char **argv)
exec_cmd_init("perf", PREFIX, PERF_EXEC_PATH, EXEC_PATH_ENVIRONMENT); exec_cmd_init("perf", PREFIX, PERF_EXEC_PATH, EXEC_PATH_ENVIRONMENT);
pager_init(PERF_PAGER_ENVIRONMENT); pager_init(PERF_PAGER_ENVIRONMENT);
libperf_init(); libperf_init(libperf_print);
cmd = extract_argv0_path(argv[0]); cmd = extract_argv0_path(argv[0]);
if (!cmd) if (!cmd)