Merge tag 'perf-urgent-for-mingo' of... (45179fec) · Commits · e / devices / android_kernel_teracube_2e

tools/perf/Makefile

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -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)		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		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)		ALL_LDFLAGS = $(LDFLAGS)
	STRIP ?= strip		STRIP ?= strip

	@@ -168,10 +168,7 @@ endif

	### --- END CONFIGURATION SECTION ---		### --- END CONFIGURATION SECTION ---

	# Those must not be GNU-specific; they are shared with perl/ which may		BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
	# 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_LDFLAGS =		BASIC_LDFLAGS =

	# Guard against environment variables		# Guard against environment variables

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.		* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
	*		*
	*/		*/
	#define _GNU_SOURCE
	#include <sys/utsname.h>		#include <sys/utsname.h>
	#include <sys/types.h>		#include <sys/types.h>
	#include <sys/stat.h>		#include <sys/stat.h>
	@@ -31,7 +30,6 @@
	#include <stdlib.h>		#include <stdlib.h>
	#include <string.h>		#include <string.h>

	#undef _GNU_SOURCE
	#include "perf.h"		#include "perf.h"
	#include "builtin.h"		#include "builtin.h"
	#include "util/util.h"		#include "util/util.h"

+10 −3

Original line number	Original line	Diff line number	Diff line
	@@ -89,8 +89,6 @@ void get_term_dimensions(struct winsize *ws)

	static void perf_top__update_print_entries(struct perf_top *top)		static void perf_top__update_print_entries(struct perf_top *top)
	{		{
	top->print_entries = top->winsize.ws_row;

	if (top->print_entries > 9)		if (top->print_entries > 9)
	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 ar
	struct perf_top *top = arg;		struct perf_top *top = arg;

	get_term_dimensions(&top->winsize);		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);		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);		perf_top__sig_winch(SIGWINCH, NULL, top);
	sigaction(SIGWINCH, &act, NULL);		sigaction(SIGWINCH, &act, NULL);
	} else		} else {
			perf_top__sig_winch(SIGWINCH, NULL, top);
	signal(SIGWINCH, SIG_DFL);		signal(SIGWINCH, SIG_DFL);
			}
	break;		break;
	case 'E':		case 'E':
	if (top->evlist->nr_entries > 1) {		if (top->evlist->nr_entries > 1) {

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);		strncpy(ev.event_type.event_type.name, name, MAX_EVENT_NAME - 1);

	ev.event_type.header.type = PERF_RECORD_HEADER_EVENT_TYPE;		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));		size = ALIGN(size, sizeof(u64));
	ev.event_type.header.size = sizeof(ev.event_type) -		ev.event_type.header.size = sizeof(ev.event_type) -
	(sizeof(ev.event_type.event_type.name) - size);		(sizeof(ev.event_type.event_type.name) - size);

+0 −2