leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf/urgent fixes:

Browse Source 
Developer stuff:
 . Fix memory leak and backward compatibility macros for pevent
   filter enums in traceevent library (Steven Rostedt)
 
 . Disable libdw unwind for all but x86 arch (Jiri Olsa)
 
 . Fix memory leak in sample_ustack (Masanari Iida)
 
 Signed-off-by: Jiri Olsa <jolsa@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTV6JYAAoJEPZqUSBWB3s9+qUP/R9Q6eFCX1liO1VPVxGfqS5K
 gZQpYhF/nn1N7JOOAgiiXjbocosMiSxEFImuL9B9yFoPWhwrGBeqiyTBrHX/GFwG
 lgioE/I9e0t/KqvuhNN429/FpeD3W3aN1sB0wccLcGcW2iztmIrWV/Cc8ivJvvO5
 igxoYS3f2HVlvLZFYKYiZxUDyYzt/YZre9LHVnKeSXVrr9vy6K+lZlBdnbYDPppF
 qzNGNylmugXG9eqRoDYllwJC2Sgv4SfJ9Jt72mavPPes1V+utVeQDsTUZRbHDnDs
 5bYNYBgai2+cQ1l01AUF4GvTWoB3vp/xc7Xvt4KhVpHV0bPBv2JJyA/A7ezFr0bV
 LnyjZ3d4U1ZWbfPjjlfdMM/bgIccCmd+UT3EO76HlVd0Y+hZ4+4mr1ZQ4hiSLFRe
 rA0XDFoA/uOYuad6p7ny8UqfpsqPUIWAX7THBNh/D+Ebslcqaxo6itGCqh/JX0R+
 r0ntl9Ktdl0GrN5gVDWlLLpAVp8gVU5cxFfUd127ndUGJEndEvoGonq7yndbupqj
 choaDfp1DRU695wI9btk1L3rQeK65jny34r2y8X5HcJoL1vOOQFJeC6QCaRzmBT+
 0M97nTwH2j40vxbySr/+XOGDxA8J61PcUgJ7oeZB2Wa8jDyAHSrq7R7X2tCvwqws
 gU80nElivbAI41oEsKKi
 =wcOX
 -----END PGP SIGNATURE-----

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/urgent

Pull perf/urgent fixes from Jiri Olsa:

  * Fix memory leak and backward compatibility macros for pevent
    filter enums in traceevent library (Steven Rostedt)

  * Disable libdw unwind for all but x86 arch (Jiri Olsa)

  * Fix memory leak in sample_ustack (Masanari Iida)

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2014-04-23 15:08:00 +02:00
commit 89b90ee37a
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/lib/traceevent/event-parse.c
View File

@ -4344,6 +4344,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
format, len_arg, arg);
trace_seq_terminate(&p);
trace_seq_puts(s, p.buffer);
trace_seq_destroy(&p);
arg = arg->next;
break;
default:

4
tools/lib/traceevent/event-parse.h
View File

@ -876,8 +876,8 @@ struct event_filter {
struct event_filter *pevent_filter_alloc(struct pevent *pevent);
/* for backward compatibility */
#define FILTER_NONE PEVENT_ERRNO__FILTER_NOT_FOUND
#define FILTER_NOEXIST PEVENT_ERRNO__NO_FILTER
#define FILTER_NONE PEVENT_ERRNO__NO_FILTER
#define FILTER_NOEXIST PEVENT_ERRNO__FILTER_NOT_FOUND
#define FILTER_MISS PEVENT_ERRNO__FILTER_MISS
#define FILTER_MATCH PEVENT_ERRNO__FILTER_MATCH

1
tools/perf/arch/x86/tests/dwarf-unwind.c
View File

@ -26,6 +26,7 @@ static int sample_ustack(struct perf_sample *sample,
map = map_groups__find(&thread->mg, MAP__FUNCTION, (u64) sp);
if (!map) {
pr_debug("failed to get stack map\n");
free(buf);
return -1;
}

8
tools/perf/config/Makefile
View File

@ -34,6 +34,14 @@ ifeq ($(ARCH),arm)
LIBUNWIND_LIBS = -lunwind -lunwind-arm
endif
# So far there's only x86 libdw unwind support merged in perf.
# Disable it on all other architectures in case libdw unwind
# support is detected in system. Add supported architectures
# to the check.
ifneq ($(ARCH),x86)
NO_LIBDW_DWARF_UNWIND := 1
endif
ifeq ($(LIBUNWIND_LIBS),)
NO_LIBUNWIND := 1
else