perf fixes
Subsystems (2)
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
HEAD: 45179fec946dd554f74e950d2278dabd5ad23fd3 Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Thanks,
Ingo
------------------>
Dan Carpenter (1):
x86/dumpstack: Remove unneeded check in dump_trace()
David Daney (1):
perf tools: Fix broken build by defining _GNU_SOURCE in Makefile
Stephane Eranian (3):
perf: Fix broken interrupt rate throttling
perf tools: Fix strlen() bug in perf_event__synthesize_event_type() perf top: Fix number of samples displayed
arch/x86/kernel/dumpstack_64.c | 2 +- include/linux/perf_event.h | 1 + kernel/events/core.c | 104 ++++++++++++++++++++++------------- tools/perf/Makefile | 7 +-- tools/perf/builtin-probe.c | 2 - tools/perf/builtin-top.c | 13 +++- tools/perf/util/header.c | 2 +- tools/perf/util/probe-event.c | 2 - tools/perf/util/symbol.c | 1 - tools/perf/util/trace-event-parse.c | 3 +- tools/perf/util/ui/browsers/hists.c | 2 - tools/perf/util/ui/helpline.c | 1 - tools/perf/util/util.h | 1 - 13 files changed, 82 insertions(+), 59 deletions(-)
arch/x86/kernel/dumpstack_64.c +1 -1
@@ -129,7 +129,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,if (!stack) {if (regs) stack = (unsigned long *)regs->sp; -else if (task && task != current) +else if (task != current) stack = (unsigned long *)task->thread.sp;else stack = &dummy;
include/linux/perf_event.h +1 -0
@@ -587,6 +587,7 @@ struct hw_perf_event {u64 sample_period;u64 last_period;local64_t period_left; +u64 interrupts_seq;u64 interrupts;u64 freq_time_stamp;
kernel/events/core.c +66 -38
198 lines not on this page · raw message
tools/perf/Makefile +2 -5
@@ -104,7 +104,7 @@ endif CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) EXTLIBS = -lpthread -lrt -lelf -lm -ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE ALL_LDFLAGS = $(LDFLAGS) STRIP ?= strip
@@ -168,10 +168,7 @@ endif ### --- END CONFIGURATION SECTION --- -# Those must not be GNU-specific; they are shared with perl/ which may -# be built by a different compiler. (Note that this is an artifact now -# but it still might be nice to keep that distinction.) -BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include +BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE BASIC_LDFLAGS = # Guard against environment variables
tools/perf/builtin-probe.c +0 -2
@@ -20,7 +20,6 @@* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ -#define _GNU_SOURCE#include <sys/utsname.h> #include <sys/types.h> #include <sys/stat.h>
@@ -31,7 +30,6 @@#include <stdlib.h> #include <string.h> -#undef _GNU_SOURCE#include "perf.h" #include "builtin.h" #include "util/util.h"
tools/perf/builtin-top.c +10 -3
@@ -89,8 +89,6 @@ void get_term_dimensions(struct winsize *ws)static void perf_top__update_print_entries (struct perf_top *top) { - top->print_entries = top->winsize.ws_row; -if (top->print_entries >9 ) top->print_entries -=9 ; }
@@ -100,6 +98,13 @@ static void perf_top__sig_winch(int sig __used, siginfo_t *info __used, void *arstruct perf_top *top = arg;get_term_dimensions (&top->winsize); +if (!top->print_entries + || (top->print_entries+4 ) > top->winsize.ws_row) { + top->print_entries = top->winsize.ws_row; + }else { + top->print_entries +=4 ; + top->winsize.ws_row = top->print_entries; + }perf_top__update_print_entries (top); }
@@ -453,8 +458,10 @@ static void perf_top__handle_keypress(struct perf_top *top, int c) };perf_top__sig_winch (SIGWINCH ,NULL , top);sigaction (SIGWINCH , &act,NULL ); - }else + }else { +perf_top__sig_winch (SIGWINCH ,NULL , top);signal (SIGWINCH ,SIG_DFL ); + }break ;case 'E' :if (top->evlist->nr_entries >1 ) {
tools/perf/util/header.c +1 -1
@@ -2105,7 +2105,7 @@ int perf_event__synthesize_event_type(struct perf_tool *tool,strncpy (ev.event_type.event_type.name, name,MAX_EVENT_NAME -1 ); ev.event_type.header.type =PERF_RECORD_HEADER_EVENT_TYPE ; - size =strlen (name); + size =strlen (ev.event_type.event_type.name); size =ALIGN (size,sizeof (u64)); ev.event_type.header.size =sizeof (ev.event_type) - (sizeof (ev.event_type.event_type.name) - size);
tools/perf/util/probe-event.c +0 -2
@@ -19,7 +19,6 @@* */ -#define _GNU_SOURCE#include <sys/utsname.h> #include <sys/types.h> #include <sys/stat.h>
@@ -33,7 +32,6 @@#include <limits.h> #include <elf.h> -#undef _GNU_SOURCE#include "util.h" #include "event.h" #include "string.h"
tools/perf/util/symbol.c +0 -1
@@ -1,4 +1,3 @@ -#define _GNU_SOURCE#include <ctype.h> #include <dirent.h> #include <errno.h>
tools/perf/util/trace-event-parse.c +1 -2
@@ -21,14 +21,13 @@* The parts for function graph printing was taken and modified from the * Linux Kernel that were written by Frederic Weisbecker. */ -#define _GNU_SOURCE +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <errno.h> -#undef _GNU_SOURCE#include "../perf.h" #include "util.h" #include "trace-event.h"
tools/perf/util/ui/browsers/hists.c +0 -2
@@ -1,6 +1,4 @@ -#define _GNU_SOURCE#include <stdio.h> -#undef _GNU_SOURCE#include "../libslang.h" #include <stdlib.h> #include <string.h>
tools/perf/util/ui/helpline.c +0 -1
@@ -1,4 +1,3 @@ -#define _GNU_SOURCE#include <stdio.h> #include <stdlib.h> #include <string.h>
tools/perf/util/util.h +0 -1
@@ -40,7 +40,6 @@#define decimal_length (x) ((int)(sizeof(x) * 2.56 + 0.5) + 1)#define _ALL_SOURCE 1 -#define _GNU_SOURCE 1#define _BSD_SOURCE 1#define HAS_BOOL