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

Commit 5796f8f0 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add stat event synthesize function 



Introduce the perf_event__synthesize_stat function to synthesize a
'struct stat_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-16-git-send-email-jolsa@kernel.org


[ Renamed 'stat' parameter to 'st' to fix 'already defined' build error with older distros (e.g. RHEL6.7) ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d80518c9

tools/perf/tests/builtin-test.c

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ static struct test generic_tests[] = { 
		.desc = "Test stat config synthesize",

		.func = test__synthesize_stat_config,

	},

	{

		.desc = "Test stat synthesize",

		.func = test__synthesize_stat,

	},

	{

		.func = NULL,

	},

tools/perf/tests/stat.c

+36 −5
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include "event.h"

#include "tests.h"

#include "stat.h"

#include "counts.h"

#include "debug.h"



static bool has_term(struct stat_config_event *config,
@@ -18,7 +19,7 @@ static bool has_term(struct stat_config_event *config, 
	return false;

}



static int process_event(struct perf_tool *tool __maybe_unused,

static int process_stat_config_event(struct perf_tool *tool __maybe_unused,

				     union perf_event *event,

				     struct perf_sample *sample __maybe_unused,

				     struct machine *machine __maybe_unused)
@@ -53,7 +54,37 @@ int test__synthesize_stat_config(int subtest __maybe_unused) 
	};



	TEST_ASSERT_VAL("failed to synthesize stat_config",

		!perf_event__synthesize_stat_config(NULL, &stat_config, process_event, NULL));

		!perf_event__synthesize_stat_config(NULL, &stat_config, process_stat_config_event, NULL));



	return 0;

}



static int process_stat_event(struct perf_tool *tool __maybe_unused,

			      union perf_event *event,

			      struct perf_sample *sample __maybe_unused,

			      struct machine *machine __maybe_unused)

{

	struct stat_event *st = &event->stat;



	TEST_ASSERT_VAL("wrong cpu",    st->cpu    == 1);

	TEST_ASSERT_VAL("wrong thread", st->thread == 2);

	TEST_ASSERT_VAL("wrong id",     st->id     == 3);

	TEST_ASSERT_VAL("wrong val",    st->val    == 100);

	TEST_ASSERT_VAL("wrong run",    st->ena    == 200);

	TEST_ASSERT_VAL("wrong ena",    st->run    == 300);

	return 0;

}



int test__synthesize_stat(int subtest __maybe_unused)

{

	struct perf_counts_values count;



	count.val = 100;

	count.ena = 200;

	count.run = 300;



	TEST_ASSERT_VAL("failed to synthesize stat_config",

		!perf_event__synthesize_stat(NULL, 1, 2, 3, &count, process_stat_event, NULL));



	return 0;

}

tools/perf/tests/tests.h

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ int test_session_topology(int subtest); 
int test__thread_map_synthesize(int subtest);

int test__cpu_map_synthesize(int subtest);

int test__synthesize_stat_config(int subtest);

int test__synthesize_stat(int subtest);



#if defined(__arm__) || defined(__aarch64__)

#ifdef HAVE_DWARF_UNWIND_SUPPORT

tools/perf/util/event.c

+22 −0
Original line number Diff line number Diff line
@@ -910,6 +910,28 @@ int perf_event__synthesize_stat_config(struct perf_tool *tool, 
	return err;

}



int perf_event__synthesize_stat(struct perf_tool *tool,

				u32 cpu, u32 thread, u64 id,

				struct perf_counts_values *count,

				perf_event__handler_t process,

				struct machine *machine)

{

	struct stat_event event;



	event.header.type = PERF_RECORD_STAT;

	event.header.size = sizeof(event);

	event.header.misc = 0;



	event.id        = id;

	event.cpu       = cpu;

	event.thread    = thread;

	event.val       = count->val;

	event.ena       = count->ena;

	event.run       = count->run;



	return process(tool, (union perf_event *) &event, NULL, machine);

}



void perf_event__read_stat_config(struct perf_stat_config *config,

				  struct stat_config_event *event)

{

tools/perf/util/event.h

+6 −1
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ struct perf_tool; 
struct thread_map;

struct cpu_map;

struct perf_stat_config;

struct perf_counts_values;



typedef int (*perf_event__handler_t)(struct perf_tool *tool,

				     union perf_event *event,
@@ -498,7 +499,11 @@ int perf_event__synthesize_stat_config(struct perf_tool *tool, 
				       struct machine *machine);

void perf_event__read_stat_config(struct perf_stat_config *config,

				  struct stat_config_event *event);



int perf_event__synthesize_stat(struct perf_tool *tool,

				u32 cpu, u32 thread, u64 id,

				struct perf_counts_values *count,

				perf_event__handler_t process,

				struct machine *machine);

int perf_event__synthesize_modules(struct perf_tool *tool,

				   perf_event__handler_t process,

				   struct machine *machine);