mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
	David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	"Liang, Kan" <kan.liang@intel.com>
Subject: [PATCH 06/56] perf tools: Add cpu_map event synthesize function
Date: Tue,  6 Oct 2015 21:54:45 +0200	[thread overview]
Message-ID: <1444161335-26734-7-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1444161335-26734-1-git-send-email-jolsa@kernel.org>

Introduce perf_event__synthesize_cpu_map function to
synthesize struct cpu_map.

Link: http://lkml.kernel.org/n/tip-miidn8vqsx3udu4ct8103v5f@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/tests/Build          |  1 +
 tools/perf/tests/builtin-test.c |  4 ++++
 tools/perf/tests/cpumap.c       | 29 +++++++++++++++++++++++++++++
 tools/perf/tests/tests.h        |  1 +
 tools/perf/util/event.c         | 28 ++++++++++++++++++++++++++++
 tools/perf/util/event.h         |  5 +++++
 6 files changed, 68 insertions(+)
 create mode 100644 tools/perf/tests/cpumap.c

diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
index 50de2253cff6..1c0296fc95ea 100644
--- a/tools/perf/tests/Build
+++ b/tools/perf/tests/Build
@@ -33,6 +33,7 @@ perf-y += kmod-path.o
 perf-y += thread-map.o
 perf-y += llvm.o
 perf-y += topology.o
+perf-y += cpumap.o
 
 ifeq ($(ARCH),$(filter $(ARCH),x86 arm arm64))
 perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 9bbe1c39740e..3b8b518d96f9 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -171,6 +171,10 @@ static struct test generic_tests[] = {
 		.func = test__thread_map_synthesize,
 	},
 	{
+		.desc = "Test cpu map synthesize",
+		.func = test__cpu_map_synthesize,
+	},
+	{
 		.func = NULL,
 	},
 };
diff --git a/tools/perf/tests/cpumap.c b/tools/perf/tests/cpumap.c
new file mode 100644
index 000000000000..475c040f8a8d
--- /dev/null
+++ b/tools/perf/tests/cpumap.c
@@ -0,0 +1,29 @@
+#include "tests.h"
+#include "cpumap.h"
+
+static int process_event(struct perf_tool *tool __maybe_unused,
+			 union perf_event *event,
+			 struct perf_sample *sample __maybe_unused,
+			 struct machine *machine __maybe_unused)
+{
+	struct cpu_map_event *map = &event->cpu_map;
+
+	TEST_ASSERT_VAL("wrong nr",   map->nr == 3);
+	TEST_ASSERT_VAL("wrong cpu",  map->cpu[0] == 1);
+	TEST_ASSERT_VAL("wrong cpu",  map->cpu[1] == 2);
+	TEST_ASSERT_VAL("wrong cpu",  map->cpu[2] == 4);
+	return 0;
+}
+
+int test__cpu_map_synthesize(void)
+{
+	struct cpu_map *cpus;
+
+	cpus = cpu_map__new("1,2,4");
+
+
+	TEST_ASSERT_VAL("failed to synthesize map",
+		!perf_event__synthesize_cpu_map(NULL, cpus, process_event, NULL));
+
+	return 0;
+}
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index 2e280a5cd579..c7f3c3211bcf 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -68,6 +68,7 @@ int test__thread_map(void);
 int test__llvm(void);
 int test_session_topology(void);
 int test__thread_map_synthesize(void);
+int test__cpu_map_synthesize(void);
 
 #if defined(__arm__) || defined(__aarch64__)
 #ifdef HAVE_DWARF_UNWIND_SUPPORT
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index c05f4b036069..eac52f12c5c4 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -737,6 +737,34 @@ int perf_event__synthesize_thread_map2(struct perf_tool *tool,
 	return err;
 }
 
+int perf_event__synthesize_cpu_map(struct perf_tool *tool,
+				   struct cpu_map *cpus,
+				   perf_event__handler_t process,
+				   struct machine *machine)
+{
+	union perf_event *event;
+	int i, err, size;
+
+	size  = sizeof(event->cpu_map);
+	size +=	cpus->nr * sizeof(event->cpu_map.cpu[0]);
+
+	event = zalloc(size);
+	if (!event)
+		return -ENOMEM;
+
+	event->header.type = PERF_RECORD_CPU_MAP;
+	event->header.size = size;
+	event->cpu_map.nr = cpus->nr;
+
+	for (i = 0; i < cpus->nr; i++)
+		event->cpu_map.cpu[i] = cpus->map[i];
+
+	err = process(tool, event, NULL, machine);
+
+	free(event);
+	return err;
+}
+
 size_t perf_event__fprintf_comm(union perf_event *event, FILE *fp)
 {
 	const char *s;
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 84104cfaab87..e58a36b8ecbc 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -405,6 +405,7 @@ void perf_event__print_totals(void);
 
 struct perf_tool;
 struct thread_map;
+struct cpu_map;
 
 typedef int (*perf_event__handler_t)(struct perf_tool *tool,
 				     union perf_event *event,
@@ -420,6 +421,10 @@ int perf_event__synthesize_thread_map2(struct perf_tool *tool,
 				      struct thread_map *threads,
 				      perf_event__handler_t process,
 				      struct machine *machine);
+int perf_event__synthesize_cpu_map(struct perf_tool *tool,
+				   struct cpu_map *cpus,
+				   perf_event__handler_t process,
+				   struct machine *machine);
 int perf_event__synthesize_threads(struct perf_tool *tool,
 				   perf_event__handler_t process,
 				   struct machine *machine, bool mmap_data,
-- 
2.4.3


  parent reply	other threads:[~2015-10-06 20:11 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-06 19:54 [PATCHv3 00/56] perf stat: Add scripting support Jiri Olsa
2015-10-06 19:54 ` [PATCH 01/56] perf tools: Add thread_map event Jiri Olsa
2015-10-06 19:54 ` [PATCH 02/56] perf tools: Add thread_map event sythesize function Jiri Olsa
2015-10-06 19:54 ` [PATCH 03/56] perf tools: Add thread_map__new_event function Jiri Olsa
2015-10-06 19:54 ` [PATCH 04/56] perf tools: Add perf_event__fprintf_thread_map function Jiri Olsa
2015-10-06 19:54 ` [PATCH 05/56] perf tools: Add cpu_map event Jiri Olsa
2015-10-06 19:54 ` Jiri Olsa [this message]
2015-10-06 19:54 ` [PATCH 07/56] perf tools: Add cpu_map__new_event function Jiri Olsa
2015-10-06 19:54 ` [PATCH 08/56] perf tools: Add perf_event__fprintf_cpu_map function Jiri Olsa
2015-10-06 19:54 ` [PATCH 09/56] perf tools: Add stat config event Jiri Olsa
2015-10-06 19:54 ` [PATCH 10/56] perf tools: Add stat config event synthesize function Jiri Olsa
2015-10-06 19:54 ` [PATCH 11/56] perf tools: Add stat config event read function Jiri Olsa
2015-10-06 19:54 ` [PATCH 12/56] perf tools: Add stat event Jiri Olsa
2015-10-06 19:54 ` [PATCH 13/56] perf tools: Add stat event synthesize function Jiri Olsa
2015-10-06 19:54 ` [PATCH 14/56] perf tools: Add stat event read function Jiri Olsa
2015-10-06 19:54 ` [PATCH 15/56] perf tools: Add stat round event Jiri Olsa
2015-10-06 19:54 ` [PATCH 16/56] perf tools: Add stat round event synthesize function Jiri Olsa
2015-10-06 19:54 ` [PATCH 17/56] perf tools: Add stat events fprintf functions Jiri Olsa
2015-10-06 19:54 ` [PATCH 18/56] perf tools: Add attr_update event Jiri Olsa
2015-10-06 19:54 ` [PATCH 19/56] perf tools: Add attr_update event unit type Jiri Olsa
2015-10-06 19:54 ` [PATCH 20/56] perf tools: Add attr_update event scale type Jiri Olsa
2015-10-06 19:55 ` [PATCH 21/56] perf tools: Add attr_update event name type Jiri Olsa
2015-10-06 19:55 ` [PATCH 22/56] perf tools: Add perf_event__fprintf_attr_update function Jiri Olsa
2015-10-06 19:55 ` [PATCH 23/56] perf report: Display newly added events in raw dump Jiri Olsa
2015-10-06 19:55 ` [PATCH 24/56] perf tools: Introduce stat feature Jiri Olsa
2015-10-06 19:55 ` [PATCH 25/56] perf tools: Move id_offset out of struct perf_evsel union Jiri Olsa
2015-10-06 19:55 ` [PATCH 26/56] perf stat: Rename perf_stat struct into perf_stat_evsel Jiri Olsa
2015-10-06 19:55 ` [PATCH 27/56] perf stat: Add AGGR_UNSET mode Jiri Olsa
2015-10-06 19:55 ` [PATCH 28/56] perf stat record: Add record command Jiri Olsa
2015-10-06 19:55 ` [PATCH 29/56] perf stat record: Initialize record features Jiri Olsa
2015-10-06 19:55 ` [PATCH 30/56] perf stat record: Synthesize stat record data Jiri Olsa
2015-10-06 19:55 ` [PATCH 31/56] perf stat record: Store events IDs in perf data file Jiri Olsa
2015-10-06 19:55 ` [PATCH 32/56] perf stat record: Add pipe support for record command Jiri Olsa
2015-10-06 19:55 ` [PATCH 33/56] perf stat record: Write stat events on record Jiri Olsa
2015-10-06 19:55 ` [PATCH 34/56] perf stat record: Write stat round " Jiri Olsa
2015-10-06 19:55 ` [PATCH 35/56] perf stat record: Do not allow record with multiple runs mode Jiri Olsa
2015-10-06 19:55 ` [PATCH 36/56] perf stat record: Synthesize attr update events Jiri Olsa
2015-10-06 19:55 ` [PATCH 37/56] perf tools: Add cpu_map__empty_new interface Jiri Olsa
2015-10-06 19:55 ` [PATCH 38/56] perf tools: Make cpu_map__build_map global Jiri Olsa
2015-10-06 19:55 ` [PATCH 39/56] perf tools: Add data arg to cpu_map__build_map callback Jiri Olsa
2015-10-06 19:55 ` [PATCH 40/56] perf stat report: Cache aggregated map entries in extra cpumap Jiri Olsa
2015-10-06 19:55 ` [PATCH 41/56] perf stat report: Add report command Jiri Olsa
2015-10-06 19:55 ` [PATCH 42/56] perf stat report: Process cpu/threads maps Jiri Olsa
2015-10-06 19:55 ` [PATCH 43/56] perf stat report: Process stat config event Jiri Olsa
2015-10-06 19:55 ` [PATCH 44/56] perf stat report: Add support to initialize aggr_map from file Jiri Olsa
2015-10-06 19:55 ` [PATCH 45/56] perf stat report: Process stat and stat round events Jiri Olsa
2015-10-06 19:55 ` [PATCH 46/56] perf stat report: Process attr update events Jiri Olsa
2015-10-06 19:55 ` [PATCH 47/56] perf stat report: Move csv_sep initialization before report command Jiri Olsa
2015-10-06 19:55 ` [PATCH 48/56] perf stat report: Allow to override aggr_mode Jiri Olsa
2015-10-06 19:55 ` [PATCH 49/56] perf script: Check output fields only for samples Jiri Olsa
2015-10-06 19:55 ` [PATCH 50/56] perf script: Process cpu/threads maps Jiri Olsa
2015-10-06 19:55 ` [PATCH 51/56] perf script: Process stat config event Jiri Olsa
2015-10-06 19:55 ` [PATCH 52/56] perf script: Add process_stat/process_stat_interval scripting interface Jiri Olsa
2015-10-06 19:55 ` [PATCH 53/56] perf script: Add stat default handlers Jiri Olsa
2015-10-06 19:55 ` [PATCH 54/56] perf script: Display stat events by default Jiri Olsa
2015-10-06 19:55 ` [PATCH 55/56] perf script: Add python support for stat events Jiri Olsa
2015-10-06 19:55 ` [PATCH 56/56] perf script: Add stat-cpi.py script Jiri Olsa
2015-10-08 18:37 ` [PATCHv3 00/56] perf stat: Add scripting support Liang, Kan
2015-10-08 20:11   ` Jiri Olsa
2015-10-09 18:31     ` Liang, Kan
2015-10-14 10:54       ` Jiri Olsa
2015-10-14 19:41         ` Liang, Kan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1444161335-26734-7-git-send-email-jolsa@kernel.org \
    --to=jolsa@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=dsahern@gmail.com \
    --cc=kan.liang@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome