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

Commit 30fdaa6b 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:

User visible changes:

  - Show the first event with an invalid filter (David Ahern, Arnaldo Carvalho de Melo)

  - Fix garbage output when intermixing syscalls from different threads in 'perf trace' (Arnaldo Carvalho de Melo)

  - Fix 'perf timechart' SIBGUS error on sparc64 (David Ahern)

Infrastructure changes:

  - Set JOBS based on CPU or processor, making it work on SPARC, where
    /proc/cpuinfo has "CPU", not "processor" (David Ahern)

  - Zero should not be considered "not found" in libtraceevent's eval_flag() (Steven Rostedt)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents baa5a7bc 7c27f78a

tools/lib/traceevent/event-parse.c

+5 −5
Original line number Diff line number Diff line
@@ -3615,7 +3615,7 @@ static const struct flag flags[] = { 
	{ "HRTIMER_RESTART", 1 },

};



static unsigned long long eval_flag(const char *flag)

static long long eval_flag(const char *flag)

{

	int i;
@@ -3631,7 +3631,7 @@ static unsigned long long eval_flag(const char *flag) 
		if (strcmp(flags[i].name, flag) == 0)

			return flags[i].value;



	return 0;

	return -1LL;

}



static void print_str_to_seq(struct trace_seq *s, const char *format,
@@ -3705,7 +3705,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, 
	struct print_flag_sym *flag;

	struct format_field *field;

	struct printk_map *printk;

	unsigned long long val, fval;

	long long val, fval;

	unsigned long addr;

	char *str;

	unsigned char *hex;
@@ -3764,11 +3764,11 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, 
		print = 0;

		for (flag = arg->flags.flags; flag; flag = flag->next) {

			fval = eval_flag(flag->value);

			if (!val && !fval) {

			if (!val && fval < 0) {

				print_str_to_seq(s, format, len_arg, flag->str);

				break;

			}

			if (fval && (val & fval) == fval) {

			if (fval > 0 && (val & fval) == fval) {

				if (print && arg->flags.delim)

					trace_seq_puts(s, arg->flags.delim);

				print_str_to_seq(s, format, len_arg, flag->str);

tools/perf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ unexport MAKEFLAGS 
# (To override it, run 'make JOBS=1' and similar.)

#

ifeq ($(JOBS),)

  JOBS := $(shell grep -c ^processor /proc/cpuinfo 2>/dev/null)

  JOBS := $(shell egrep -c '^processor|^CPU' /proc/cpuinfo 2>/dev/null)

  ifeq ($(JOBS),0)

    JOBS := 1

  endif

tools/perf/builtin-record.c

+3 −2
Original line number Diff line number Diff line
@@ -161,8 +161,9 @@ static int record__open(struct record *rec) 
		}

	}



	if (perf_evlist__apply_filters(evlist)) {

		error("failed to set filter with %d (%s)\n", errno,

	if (perf_evlist__apply_filters(evlist, &pos)) {

		error("failed to set filter \"%s\" on event %s with %d (%s)\n",

			pos->filter, perf_evsel__name(pos), errno,

			strerror_r(errno, msg, sizeof(msg)));

		rc = -1;

		goto out;

tools/perf/builtin-stat.c

+3 −2
Original line number Diff line number Diff line
@@ -684,8 +684,9 @@ static int __run_perf_stat(int argc, const char **argv) 
			unit_width = l;

	}



	if (perf_evlist__apply_filters(evsel_list)) {

		error("failed to set filter with %d (%s)\n", errno,

	if (perf_evlist__apply_filters(evsel_list, &counter)) {

		error("failed to set filter \"%s\" on event %s with %d (%s)\n",

			counter->filter, perf_evsel__name(counter), errno,

			strerror_r(errno, msg, sizeof(msg)));

		return -1;

	}

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -1735,7 +1735,7 @@ static int trace__sys_enter(struct trace *trace, struct perf_evsel *evsel, 
	}



	if (!trace->summary_only)

		printed += trace__printf_interrupted_entry(trace, sample);

		trace__printf_interrupted_entry(trace, sample);



	ttrace->entry_time = sample->time;

	msg = ttrace->entry_str;