Commit 387ef4e2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

perf/core improvements and fixes:

 - Preparatory patches to use hw events in PMU syntax, from Jiri Olsa

 - Remaining backport of trace-cmd's libparseevent, from Namhyung Kim

 - Fix libtraceevent 'clean' make target, from Namhyung Kim

 - Teach ctags about libtraceevent error codes, from Namhyung Kim

 - Fix libtraceevent dependency files usage, from Namhyung Kim

 - Support hex number pretty printing in libtraceevent, fixing
   kvm output, from Namhyung Kim

 - Kill some die() usage in libtraceevent, from Namhyung Kim

 - Improve support for hw breakpoints parsing/pretty printing/testing,
  from Jiri Olsa

 - Clarify perf bench option naming, from Hitoshi Mitake

 - Look for ".note" ELF notes too, used in the kernel vdso, from Jiri Olsa

 - Fix internal PMU list usage, removing leak, from Robert Richter

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6a67943a 81e9b994

tools/lib/traceevent/Makefile

+10 −4
Original line number Diff line number Diff line
@@ -250,8 +250,12 @@ endef 
all_objs := $(sort $(ALL_OBJS))

all_deps := $(all_objs:%.o=.%.d)



# let .d file also depends on the source and header files

define check_deps

		$(CC) -M $(CFLAGS) $< > $@;

		@set -e; $(RM) $@; \

		$(CC) -M $(CFLAGS) $< > $@.$$$$; \

		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \

		$(RM) $@.$$$$

endef



$(gui_deps): ks_version.h
@@ -270,11 +274,13 @@ endif 


tags:	force

	$(RM) tags

	find . -name '*.[ch]' | xargs ctags --extra=+f --c-kinds=+px

	find . -name '*.[ch]' | xargs ctags --extra=+f --c-kinds=+px \

	--regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'



TAGS:	force

	$(RM) TAGS

	find . -name '*.[ch]' | xargs etags

	find . -name '*.[ch]' | xargs etags \

	--regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/'



define do_install

	$(print_install)				\

tools/lib/traceevent/event-parse.c

+295 −104

File changed.

Preview size limit exceeded, changes collapsed.

tools/lib/traceevent/event-parse.h

+7 −0
Original line number Diff line number Diff line
@@ -226,6 +226,11 @@ struct print_arg_symbol { 
	struct print_flag_sym	*symbols;

};



struct print_arg_hex {

	struct print_arg	*field;

	struct print_arg	*size;

};



struct print_arg_dynarray {

	struct format_field	*field;

	struct print_arg	*index;
@@ -253,6 +258,7 @@ enum print_arg_type { 
	PRINT_FIELD,

	PRINT_FLAGS,

	PRINT_SYMBOL,

	PRINT_HEX,

	PRINT_TYPE,

	PRINT_STRING,

	PRINT_BSTRING,
@@ -270,6 +276,7 @@ struct print_arg { 
		struct print_arg_typecast	typecast;

		struct print_arg_flags		flags;

		struct print_arg_symbol		symbol;

		struct print_arg_hex		hex;

		struct print_arg_func		func;

		struct print_arg_string		string;

		struct print_arg_op		op;

tools/lib/traceevent/parse-filter.c

+57 −29
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static enum event_type read_token(char **tok) 
	    (strcmp(token, "=") == 0 || strcmp(token, "!") == 0) &&

	    pevent_peek_char() == '~') {

		/* append it */

		*tok = malloc(3);

		*tok = malloc_or_die(3);

		sprintf(*tok, "%c%c", *token, '~');

		free_token(token);

		/* Now remove the '~' from the buffer */
@@ -148,17 +148,11 @@ add_filter_type(struct event_filter *filter, int id) 
	if (filter_type)

		return filter_type;



	if (!filter->filters)

		filter->event_filters =

			malloc_or_die(sizeof(*filter->event_filters));

	else {

		filter->event_filters =

			realloc(filter->event_filters,

	filter->event_filters =	realloc(filter->event_filters,

					sizeof(*filter->event_filters) *

					(filter->filters + 1));

	if (!filter->event_filters)

		die("Could not allocate filter");

	}



	for (i = 0; i < filter->filters; i++) {

		if (filter->event_filters[i].event_id > id)
@@ -1480,7 +1474,7 @@ void pevent_filter_clear_trivial(struct event_filter *filter, 
{

	struct filter_type *filter_type;

	int count = 0;

	int *ids;

	int *ids = NULL;

	int i;



	if (!filter->filters)
@@ -1504,10 +1498,8 @@ void pevent_filter_clear_trivial(struct event_filter *filter, 
		default:

			break;

		}

		if (count)



		ids = realloc(ids, sizeof(*ids) * (count + 1));

		else

			ids = malloc(sizeof(*ids));

		if (!ids)

			die("Can't allocate ids");

		ids[count++] = filter_type->event_id;
@@ -1710,7 +1702,15 @@ static int test_num(struct event_format *event, 


static const char *get_field_str(struct filter_arg *arg, struct pevent_record *record)

{

	const char *val = record->data + arg->str.field->offset;

	struct event_format *event;

	struct pevent *pevent;

	unsigned long long addr;

	const char *val = NULL;

	char hex[64];



	/* If the field is not a string convert it */

	if (arg->str.field->flags & FIELD_IS_STRING) {

		val = record->data + arg->str.field->offset;



		/*

		 * We need to copy the data since we can't be sure the field
@@ -1722,6 +1722,23 @@ static const char *get_field_str(struct filter_arg *arg, struct pevent_record *r 
			/* the buffer is already NULL terminated */

			val = arg->str.buffer;

		}



	} else {

		event = arg->str.field->event;

		pevent = event->pevent;

		addr = get_value(event, arg->str.field, record);



		if (arg->str.field->flags & (FIELD_IS_POINTER | FIELD_IS_LONG))

			/* convert to a kernel symbol */

			val = pevent_find_function(pevent, addr);



		if (val == NULL) {

			/* just use the hex of the string name */

			snprintf(hex, 64, "0x%llx", addr);

			val = hex;

		}

	}



	return val;

}
@@ -2001,11 +2018,13 @@ static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg) 
	char *lstr;

	char *rstr;

	char *op;

	char *str;

	char *str = NULL;

	int len;



	lstr = arg_to_str(filter, arg->exp.left);

	rstr = arg_to_str(filter, arg->exp.right);

	if (!lstr || !rstr)

		goto out;



	switch (arg->exp.type) {

	case FILTER_EXP_ADD:
@@ -2045,6 +2064,7 @@ static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg) 
	len = strlen(op) + strlen(lstr) + strlen(rstr) + 4;

	str = malloc_or_die(len);

	snprintf(str, len, "%s %s %s", lstr, op, rstr);

out:

	free(lstr);

	free(rstr);
@@ -2061,6 +2081,8 @@ static char *num_to_str(struct event_filter *filter, struct filter_arg *arg) 


	lstr = arg_to_str(filter, arg->num.left);

	rstr = arg_to_str(filter, arg->num.right);

	if (!lstr || !rstr)

		goto out;



	switch (arg->num.type) {

	case FILTER_CMP_EQ:
@@ -2097,6 +2119,7 @@ static char *num_to_str(struct event_filter *filter, struct filter_arg *arg) 
		break;

	}



out:

	free(lstr);

	free(rstr);

	return str;
@@ -2247,7 +2270,12 @@ int pevent_filter_compare(struct event_filter *filter1, struct event_filter *fil 
		/* The best way to compare complex filters is with strings */

		str1 = arg_to_str(filter1, filter_type1->filter);

		str2 = arg_to_str(filter2, filter_type2->filter);

		if (str1 && str2)

			result = strcmp(str1, str2) != 0;

		else

			/* bail out if allocation fails */

			result = 1;



		free(str1);

		free(str2);

		if (result)

tools/perf/Documentation/perf-bench.txt

+2 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ On x86-64, x86-64-unrolled, x86-64-movsq and x86-64-movsb are supported. 
Repeat memcpy invocation this number of times.



-c::

--clock::

--cycle::

Use perf's cpu-cycles event instead of gettimeofday syscall.



-o::
@@ -176,7 +176,7 @@ On x86-64, x86-64-unrolled, x86-64-stosq and x86-64-stosb are supported. 
Repeat memset invocation this number of times.



-c::

--clock::

--cycle::

Use perf's cpu-cycles event instead of gettimeofday syscall.



-o::

CRA Git | Maintained and supported by SUSTech CRA and CCSE