Skip to content

Commit b6b6c18

Browse files
author
Ingo Molnar
committed
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: New features: - Deref sys_enter pointer args with contents from probe:vfs_getname, showing pathnames instead of pointers in many syscalls in 'perf trace'. (Arnaldo Carvalho de Melo) - Make 'perf trace' write to stderr by default, just like 'strace'. (Milian Woff) Infrastructure changes: - color_vfprintf() fixes. (Andi Kleen, Jiri Olsa) - Allow enabling/disabling PERF_SAMPLE_TIME per event. (Kan Liang) - Fix build errors with mipsel-linux-uclibc compiler. (Petri Gynther) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 75f8085 + f151f53 commit b6b6c18

File tree

16 files changed

+220
-58
lines changed

16 files changed

+220
-58
lines changed

‎tools/build/feature/test-glibc.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1+
#include <stdlib.h>
2+
3+
#if !defined(__UCLIBC__)
14
#include <gnu/libc-version.h>
5+
#else
6+
#define XSTR(s) STR(s)
7+
#define STR(s) #s
8+
#endif
29

310
int main(void)
411
{
12+
#if !defined(__UCLIBC__)
513
const char *version = gnu_get_libc_version();
14+
#else
15+
const char *version = XSTR(__GLIBC__) "." XSTR(__GLIBC_MINOR__);
16+
#endif
617

718
return (long)version;
819
}

‎tools/perf/Documentation/perf-record.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ OPTIONS
4949
These params can be used to overload default config values per event.
5050
Here is a list of the params.
5151
- 'period': Set event sampling period
52-
52+
- 'time': Disable/enable time stamping. Acceptable values are 1 for
53+
enabling time stamping. 0 for disabling time stamping.
54+
The default is 1.
5355
Note: If user explicitly sets options which conflict with the params,
5456
the value set by the params will be overridden.
5557

‎tools/perf/builtin-record.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ int record_parse_callchain_opt(const struct option *opt,
779779
return 0;
780780
}
781781

782-
ret = parse_callchain_record_opt(arg);
782+
ret = parse_callchain_record_opt(arg, &callchain_param);
783783
if (!ret)
784784
callchain_debug();
785785

‎tools/perf/builtin-script.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1861,7 +1861,8 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)
18611861
else
18621862
symbol_conf.use_callchain = false;
18631863

1864-
if (pevent_set_function_resolver(session->tevent.pevent,
1864+
if (session->tevent.pevent &&
1865+
pevent_set_function_resolver(session->tevent.pevent,
18651866
machine__resolve_kernel_addr,
18661867
&session->machines.host) < 0) {
18671868
pr_err("%s: failed to set libtraceevent function resolver\n", __func__);

0 commit comments

Comments
 (0)