Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef34eb4d 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

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

 * Fix build for another rbtree.c change, from Adrian Hunter.

 * Fixes for perf to build on Android, from Irina Tirdea.

 * Make 'perf diff' command work with evsel hists, from Jiri Olsa.

 * Use the only field_sep var that is set up: symbol_conf.field_sep,
   fix from Jiri Olsa.

 * .gitignore compiled python binaries, from Namhyung Kim.

 * Get rid of die() in more libtraceevent places, from Namhyung Kim.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 479d8758 b155a090

tools/lib/traceevent/event-parse.c

+65 −21
Original line number Original line Diff line number Diff line
@@ -3889,8 +3889,11 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event 
				goto cont_process;

				goto cont_process;

			case '*':

			case '*':

				/* The argument is the length. */

				/* The argument is the length. */

				if (!arg)

				if (!arg) {

					die("no argument match");

					do_warning("no argument match");

					event->flags |= EVENT_FL_FAILED;

					goto out_failed;

				}

				len_arg = eval_num_arg(data, size, event, arg);

				len_arg = eval_num_arg(data, size, event, arg);

				len_as_arg = 1;

				len_as_arg = 1;

				arg = arg->next;

				arg = arg->next;
@@ -3923,15 +3926,21 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event 
			case 'x':

			case 'x':

			case 'X':

			case 'X':

			case 'u':

			case 'u':

				if (!arg)

				if (!arg) {

					die("no argument match");

					do_warning("no argument match");

					event->flags |= EVENT_FL_FAILED;

					goto out_failed;

				}





				len = ((unsigned long)ptr + 1) -

				len = ((unsigned long)ptr + 1) -

					(unsigned long)saveptr;

					(unsigned long)saveptr;





				/* should never happen */

				/* should never happen */

				if (len > 31)

				if (len > 31) {

					die("bad format!");

					do_warning("bad format!");

					event->flags |= EVENT_FL_FAILED;

					len = 31;

				}





				memcpy(format, saveptr, len);

				memcpy(format, saveptr, len);

				format[len] = 0;

				format[len] = 0;
@@ -3995,19 +4004,26 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event 
						trace_seq_printf(s, format, (long long)val);

						trace_seq_printf(s, format, (long long)val);

					break;

					break;

				default:

				default:

					die("bad count (%d)", ls);

					do_warning("bad count (%d)", ls);

					event->flags |= EVENT_FL_FAILED;

				}

				}

				break;

				break;

			case 's':

			case 's':

				if (!arg)

				if (!arg) {

					die("no matching argument");

					do_warning("no matching argument");

					event->flags |= EVENT_FL_FAILED;

					goto out_failed;

				}





				len = ((unsigned long)ptr + 1) -

				len = ((unsigned long)ptr + 1) -

					(unsigned long)saveptr;

					(unsigned long)saveptr;





				/* should never happen */

				/* should never happen */

				if (len > 31)

				if (len > 31) {

					die("bad format!");

					do_warning("bad format!");

					event->flags |= EVENT_FL_FAILED;

					len = 31;

				}





				memcpy(format, saveptr, len);

				memcpy(format, saveptr, len);

				format[len] = 0;

				format[len] = 0;
@@ -4025,6 +4041,11 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event 
			trace_seq_putc(s, *ptr);

			trace_seq_putc(s, *ptr);

	}

	}





	if (event->flags & EVENT_FL_FAILED) {

out_failed:

		trace_seq_printf(s, "[FAILED TO PARSE]");

	}



	if (args) {

	if (args) {

		free_args(args);

		free_args(args);

		free(bprint_fmt);

		free(bprint_fmt);
@@ -4812,8 +4833,8 @@ int pevent_strerror(struct pevent *pevent, enum pevent_errno errnum, 
		msg = strerror_r(errnum, buf, buflen);

		msg = strerror_r(errnum, buf, buflen);

		if (msg != buf) {

		if (msg != buf) {

			size_t len = strlen(msg);

			size_t len = strlen(msg);

			char *c = mempcpy(buf, msg, min(buflen-1, len));

			memcpy(buf, msg, min(buflen - 1, len));

			*c = '\0';

			*(buf + min(buflen - 1, len)) = '\0';

		}

		}

		return 0;

		return 0;

	}

	}
@@ -5059,6 +5080,7 @@ int pevent_register_print_function(struct pevent *pevent, 
	struct pevent_func_params *param;

	struct pevent_func_params *param;

	enum pevent_func_arg_type type;

	enum pevent_func_arg_type type;

	va_list ap;

	va_list ap;

	int ret;





	func_handle = find_func_handler(pevent, name);

	func_handle = find_func_handler(pevent, name);

	if (func_handle) {

	if (func_handle) {
@@ -5071,14 +5093,21 @@ int pevent_register_print_function(struct pevent *pevent, 
		remove_func_handler(pevent, name);

		remove_func_handler(pevent, name);

	}

	}





	func_handle = malloc_or_die(sizeof(*func_handle));

	func_handle = malloc(sizeof(*func_handle));

	if (!func_handle) {

		do_warning("Failed to allocate function handler");

		return PEVENT_ERRNO__MEM_ALLOC_FAILED;

	}

	memset(func_handle, 0, sizeof(*func_handle));

	memset(func_handle, 0, sizeof(*func_handle));





	func_handle->ret_type = ret_type;

	func_handle->ret_type = ret_type;

	func_handle->name = strdup(name);

	func_handle->name = strdup(name);

	func_handle->func = func;

	func_handle->func = func;

	if (!func_handle->name)

	if (!func_handle->name) {

		die("Failed to allocate function name");

		do_warning("Failed to allocate function name");

		free(func_handle);

		return PEVENT_ERRNO__MEM_ALLOC_FAILED;

	}





	next_param = &(func_handle->params);

	next_param = &(func_handle->params);

	va_start(ap, name);

	va_start(ap, name);
@@ -5088,11 +5117,17 @@ int pevent_register_print_function(struct pevent *pevent, 
			break;

			break;





		if (type < 0 || type >= PEVENT_FUNC_ARG_MAX_TYPES) {

		if (type < 0 || type >= PEVENT_FUNC_ARG_MAX_TYPES) {

			warning("Invalid argument type %d", type);

			do_warning("Invalid argument type %d", type);

			ret = PEVENT_ERRNO__INVALID_ARG_TYPE;

			goto out_free;

			goto out_free;

		}

		}





		param = malloc_or_die(sizeof(*param));

		param = malloc(sizeof(*param));

		if (!param) {

			do_warning("Failed to allocate function param");

			ret = PEVENT_ERRNO__MEM_ALLOC_FAILED;

			goto out_free;

		}

		param->type = type;

		param->type = type;

		param->next = NULL;

		param->next = NULL;
@@ -5110,7 +5145,7 @@ int pevent_register_print_function(struct pevent *pevent, 
 out_free:

 out_free:

	va_end(ap);

	va_end(ap);

	free_func_handle(func_handle);

	free_func_handle(func_handle);

	return -1;

	return ret;

}

}





/**

/**
@@ -5162,7 +5197,12 @@ int pevent_register_event_handler(struct pevent *pevent, 




 not_found:

 not_found:

	/* Save for later use. */

	/* Save for later use. */

	handle = malloc_or_die(sizeof(*handle));

	handle = malloc(sizeof(*handle));

	if (!handle) {

		do_warning("Failed to allocate event handler");

		return PEVENT_ERRNO__MEM_ALLOC_FAILED;

	}



	memset(handle, 0, sizeof(*handle));

	memset(handle, 0, sizeof(*handle));

	handle->id = id;

	handle->id = id;

	if (event_name)

	if (event_name)
@@ -5172,7 +5212,11 @@ int pevent_register_event_handler(struct pevent *pevent, 




	if ((event_name && !handle->event_name) ||

	if ((event_name && !handle->event_name) ||

	    (sys_name && !handle->sys_name)) {

	    (sys_name && !handle->sys_name)) {

		die("Failed to allocate event/sys name");

		do_warning("Failed to allocate event/sys name");

		free((void *)handle->event_name);

		free((void *)handle->sys_name);

		free(handle);

		return PEVENT_ERRNO__MEM_ALLOC_FAILED;

	}

	}





	handle->func = func;

	handle->func = func;

tools/lib/traceevent/event-parse.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -351,7 +351,8 @@ enum pevent_flag { 
	_PE(READ_ID_FAILED,	"failed to read event id"),		      \

	_PE(READ_ID_FAILED,	"failed to read event id"),		      \

	_PE(READ_FORMAT_FAILED,	"failed to read event format"),		      \

	_PE(READ_FORMAT_FAILED,	"failed to read event format"),		      \

	_PE(READ_PRINT_FAILED,	"failed to read event print fmt"), 	      \

	_PE(READ_PRINT_FAILED,	"failed to read event print fmt"), 	      \

	_PE(OLD_FTRACE_ARG_FAILED,"failed to allocate field name for ftrace")

	_PE(OLD_FTRACE_ARG_FAILED,"failed to allocate field name for ftrace"),\

	_PE(INVALID_ARG_TYPE,	"invalid argument type")





#undef _PE

#undef _PE

#define _PE(__code, __str) PEVENT_ERRNO__ ## __code

#define _PE(__code, __str) PEVENT_ERRNO__ ## __code

tools/perf/.gitignore

+2 −0
Original line number Original line Diff line number Diff line
@@ -21,3 +21,5 @@ config.mak 
config.mak.autogen

config.mak.autogen

*-bison.*

*-bison.*

*-flex.*

*-flex.*

*.pyc

*.pyo

tools/perf/Documentation/perf-diff.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,9 @@ captured via perf record. 




If no parameters are passed it will assume perf.data.old and perf.data.

If no parameters are passed it will assume perf.data.old and perf.data.





The differential profile is displayed only for events matching both

specified perf.data files.



OPTIONS

OPTIONS

-------

-------

-M::

-M::

tools/perf/Makefile

+8 −0
Original line number Original line Diff line number Diff line
@@ -755,6 +755,14 @@ else 
	endif

	endif

endif

endif





ifdef NO_BACKTRACE

       BASIC_CFLAGS += -DNO_BACKTRACE

else

       ifneq ($(call try-cc,$(SOURCE_BACKTRACE),),y)

               BASIC_CFLAGS += -DNO_BACKTRACE

       endif

endif



ifdef ASCIIDOC8

ifdef ASCIIDOC8

	export ASCIIDOC8

	export ASCIIDOC8

endif

endif