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

Commit 86ebb09f authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add event_update event cpus type 



Adding the cpumask 'event update' event, that stores/transfer the
cpumask for a event.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarKan Liang <kan.liang@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1445784728-21732-25-git-send-email-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 802c9048

tools/perf/tests/event_update.c

+29 −0
Original line number Diff line number Diff line
@@ -53,6 +53,29 @@ static int process_event_name(struct perf_tool *tool, 
	return 0;

}



static int process_event_cpus(struct perf_tool *tool __maybe_unused,

			      union perf_event *event,

			      struct perf_sample *sample __maybe_unused,

			      struct machine *machine __maybe_unused)

{

	struct event_update_event *ev = (struct event_update_event*) event;

	struct event_update_event_cpus *ev_data;

	struct cpu_map *map;



	ev_data = (struct event_update_event_cpus*) ev->data;



	map = cpu_map__new_data(&ev_data->cpus);



	TEST_ASSERT_VAL("wrong id", ev->id == 123);

	TEST_ASSERT_VAL("wrong type", ev->type == PERF_EVENT_UPDATE__CPUS);

	TEST_ASSERT_VAL("wrong cpus", map->nr == 3);

	TEST_ASSERT_VAL("wrong cpus", map->map[0] == 1);

	TEST_ASSERT_VAL("wrong cpus", map->map[1] == 2);

	TEST_ASSERT_VAL("wrong cpus", map->map[2] == 3);

	cpu_map__put(map);

	return 0;

}



int test__event_update(int subtest __maybe_unused)

{

	struct perf_evlist *evlist;
@@ -84,5 +107,11 @@ int test__event_update(int subtest __maybe_unused) 
	TEST_ASSERT_VAL("failed to synthesize attr update name",

			!perf_event__synthesize_event_update_name(&tmp.tool, evsel, process_event_name));



	evsel->own_cpus = cpu_map__new("1,2,3");



	TEST_ASSERT_VAL("failed to synthesize attr update cpus",

			!perf_event__synthesize_event_update_cpus(&tmp.tool, evsel, process_event_cpus));



	cpu_map__put(evsel->own_cpus);

	return 0;

}

tools/perf/util/event.h

+5 −0
Original line number Diff line number Diff line
@@ -312,6 +312,11 @@ enum { 
	PERF_EVENT_UPDATE__UNIT  = 0,

	PERF_EVENT_UPDATE__SCALE = 1,

	PERF_EVENT_UPDATE__NAME  = 2,

	PERF_EVENT_UPDATE__CPUS  = 3,

};



struct event_update_event_cpus {

	struct cpu_map_data cpus;

};



struct event_update_event_scale {

tools/perf/util/header.c

+42 −0
Original line number Diff line number Diff line
@@ -2762,6 +2762,38 @@ perf_event__synthesize_event_update_name(struct perf_tool *tool, 
	return err;

}



int

perf_event__synthesize_event_update_cpus(struct perf_tool *tool,

					struct perf_evsel *evsel,

					perf_event__handler_t process)

{

	size_t size = sizeof(struct event_update_event);

	struct event_update_event *ev;

	int max, err;

	u16 type;



	if (!evsel->own_cpus)

		return 0;



	ev = cpu_map_data__alloc(evsel->own_cpus, &size, &type, &max);

	if (!ev)

		return -ENOMEM;



	ev->header.type = PERF_RECORD_EVENT_UPDATE;

	ev->header.size = (u16)size;

	ev->type = PERF_EVENT_UPDATE__CPUS;

	ev->id   = evsel->id[0];



	cpu_map_data__synthesize((struct cpu_map_data *) ev->data,

				 evsel->own_cpus,

				 type, max);



	err = process(tool, (union perf_event*) ev, NULL, NULL);

	free(ev);

	return err;

}





int perf_event__synthesize_attrs(struct perf_tool *tool,

				   struct perf_session *session,

				   perf_event__handler_t process)
@@ -2827,8 +2859,10 @@ int perf_event__process_event_update(struct perf_tool *tool __maybe_unused, 
{

	struct event_update_event *ev = &event->event_update;

	struct event_update_event_scale *ev_scale;

	struct event_update_event_cpus *ev_cpus;

	struct perf_evlist *evlist;

	struct perf_evsel *evsel;

	struct cpu_map *map;



	if (!pevlist || *pevlist == NULL)

		return -EINVAL;
@@ -2849,6 +2883,14 @@ int perf_event__process_event_update(struct perf_tool *tool __maybe_unused, 
	case PERF_EVENT_UPDATE__SCALE:

		ev_scale = (struct event_update_event_scale *) ev->data;

		evsel->scale = ev_scale->scale;

	case PERF_EVENT_UPDATE__CPUS:

		ev_cpus = (struct event_update_event_cpus *) ev->data;



		map = cpu_map__new_data(&ev_cpus->cpus);

		if (map)

			evsel->own_cpus = map;

		else

			pr_err("failed to get event_update cpus\n");

	default:

		break;

	}

tools/perf/util/header.h

+3 −0
Original line number Diff line number Diff line
@@ -114,6 +114,9 @@ int perf_event__synthesize_event_update_scale(struct perf_tool *tool, 
int perf_event__synthesize_event_update_name(struct perf_tool *tool,

					     struct perf_evsel *evsel,

					     perf_event__handler_t process);

int perf_event__synthesize_event_update_cpus(struct perf_tool *tool,

					     struct perf_evsel *evsel,

					     perf_event__handler_t process);

int perf_event__process_attr(struct perf_tool *tool, union perf_event *event,

			     struct perf_evlist **pevlist);

int perf_event__process_event_update(struct perf_tool *tool __maybe_unused,