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

Commit 034d150a 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

Small fixes, also includes an important fix from Stephane for system
wide monitoring, problem introduced recently in perf/core, in the pid
list patches.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 09bda443 6b1bee90

tools/perf/util/probe-event.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 


#include "util.h"

#include "event.h"

#include "string.h"

#include "strlist.h"

#include "debug.h"

#include "cache.h"

tools/perf/util/thread_map.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static struct thread_map *thread_map__new_by_tid_str(const char *tid_str) 
	if (!tid_str) {

		threads = malloc(sizeof(*threads) + sizeof(pid_t));

		if (threads != NULL) {

			threads->map[1] = -1;

			threads->map[0] = -1;

			threads->nr	= 1;

		}

		return threads;

tools/perf/util/trace-event-parse.c

+12 −0
Original line number Diff line number Diff line
@@ -1423,6 +1423,11 @@ static long long arg_num_eval(struct print_arg *arg) 
				die("unknown op '%s'", arg->op.op);

			}

			break;

		case '+':

			left = arg_num_eval(arg->op.left);

			right = arg_num_eval(arg->op.right);

			val = left + right;

			break;

		default:

			die("unknown op '%s'", arg->op.op);

		}
@@ -1483,6 +1488,13 @@ process_fields(struct event *event, struct print_flag_sym **list, char **tok) 


		free_token(token);

		type = process_arg(event, arg, &token);



		if (type == EVENT_OP)

			type = process_op(event, arg, &token);



		if (type == EVENT_ERROR)

			goto out_free;



		if (test_type_token(type, token, EVENT_DELIM, ","))

			goto out_free;