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 28/56] perf stat record: Add record command
Date: Tue,  6 Oct 2015 21:55:07 +0200	[thread overview]
Message-ID: <1444161335-26734-29-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1444161335-26734-1-git-send-email-jolsa@kernel.org>

Add 'perf stat record' command support. It creates simple
(header only) perf.data file ATM.

Link: http://lkml.kernel.org/n/tip-0av5yfkwyywwgoiali88w4hi@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/Documentation/perf-stat.txt | 12 ++++++
 tools/perf/builtin-stat.c              | 74 +++++++++++++++++++++++++++++++++-
 2 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/tools/perf/Documentation/perf-stat.txt b/tools/perf/Documentation/perf-stat.txt
index 4e074a660826..70eee1c2c444 100644
--- a/tools/perf/Documentation/perf-stat.txt
+++ b/tools/perf/Documentation/perf-stat.txt
@@ -10,6 +10,7 @@ SYNOPSIS
 [verse]
 'perf stat' [-e <EVENT> | --event=EVENT] [-a] <command>
 'perf stat' [-e <EVENT> | --event=EVENT] [-a] -- <command> [<options>]
+'perf stat' [-e <EVENT> | --event=EVENT] [-a] record [-o file] -- <command> [<options>]
 
 DESCRIPTION
 -----------
@@ -22,6 +23,8 @@ OPTIONS
 <command>...::
 	Any command you can specify in a shell.
 
+record::
+	See STAT RECORD.
 
 -e::
 --event=::
@@ -159,6 +162,15 @@ filter out the startup phase of the program, which is often very different.
 
 Print statistics of transactional execution if supported.
 
+STAT RECORD
+-----------
+Stores stat data into perf data file.
+
+-o file::
+--output file::
+Output file name.
+
+
 EXAMPLES
 --------
 
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index abeb15aebd12..a909160bdf8e 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -59,6 +59,7 @@
 #include "util/thread.h"
 #include "util/thread_map.h"
 #include "util/counts.h"
+#include "util/session.h"
 
 #include <stdlib.h>
 #include <sys/prctl.h>
@@ -121,6 +122,16 @@ static struct timespec		ref_time;
 static struct cpu_map		*aggr_map;
 static int			(*aggr_get_id)(struct cpu_map *m, int cpu);
 
+struct perf_stat {
+	bool			 record;
+	struct perf_data_file	 file;
+	struct perf_session	*session;
+	u64			 bytes_written;
+};
+
+static struct perf_stat		perf_stat;
+#define STAT_RECORD		perf_stat.record
+
 static volatile int done = 0;
 
 static struct perf_stat_config stat_config = {
@@ -339,6 +350,15 @@ static int __run_perf_stat(int argc, const char **argv)
 		return -1;
 	}
 
+	if (STAT_RECORD) {
+		int err, fd = perf_data_file__fd(&perf_stat.file);
+
+		err = perf_session__write_header(perf_stat.session, evsel_list,
+						 fd, false);
+		if (err < 0)
+			return err;
+	}
+
 	/*
 	 * Enable counters and exec the command:
 	 */
@@ -1130,6 +1150,39 @@ static int add_default_attributes(void)
 	return perf_evlist__add_default_attrs(evsel_list, very_very_detailed_attrs);
 }
 
+static const char * const recort_usage[] = {
+	"perf stat record [<options>]",
+	NULL,
+};
+
+static int __cmd_record(int argc, const char **argv)
+{
+	struct perf_session *session;
+	struct perf_data_file *file = &perf_stat.file;
+	const struct option options[] = {
+	OPT_STRING('o', "output", &perf_stat.file.path, "file", "output file name"),
+	OPT_END()
+	};
+
+	argc = parse_options(argc, argv, options, record_usage,
+			     PARSE_OPT_STOP_AT_NON_OPTION);
+
+	session = perf_session__new(file, false, NULL);
+	if (session == NULL) {
+		pr_err("Perf session creation failed.\n");
+		return -1;
+	}
+
+	/* No pipe support ATM */
+	if (perf_stat.file.is_pipe)
+		return -EINVAL;
+
+	session->evlist   = evsel_list;
+	perf_stat.session = session;
+	perf_stat.record  = true;
+	return argc;
+}
+
 int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
 {
 	bool append_file = false;
@@ -1203,6 +1256,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
 	const char *mode;
 	FILE *output = stderr;
 	unsigned int interval;
+	const char * const stat_subcommands[] = { "record" };
 
 	setlocale(LC_ALL, "");
 
@@ -1210,8 +1264,15 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
 	if (evsel_list == NULL)
 		return -ENOMEM;
 
-	argc = parse_options(argc, argv, options, stat_usage,
-		PARSE_OPT_STOP_AT_NON_OPTION);
+	argc = parse_options_subcommand(argc, argv, options, stat_subcommands,
+					(const char **) stat_usage,
+					PARSE_OPT_STOP_AT_NON_OPTION);
+
+	if (argc && !strncmp(argv[0], "rec", 3)) {
+		argc = __cmd_record(argc, argv);
+		if (argc < 0)
+			return -1;
+	}
 
 	interval = stat_config.interval;
 
@@ -1382,6 +1443,15 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
 	if (!forever && status != -1 && !interval)
 		print_counters(NULL, argc, argv);
 
+	if (STAT_RECORD) {
+		int fd = perf_data_file__fd(&perf_stat.file);
+
+		perf_stat.session->header.data_size += perf_stat.bytes_written;
+		perf_session__write_header(perf_stat.session, evsel_list, fd, true);
+
+		perf_session__delete(perf_stat.session);
+	}
+
 	perf_evlist__free_stats(evsel_list);
 out:
 	perf_evlist__delete(evsel_list);
-- 
2.4.3


  parent reply	other threads:[~2015-10-06 19:56 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 ` [PATCH 06/56] perf tools: Add cpu_map event synthesize function Jiri Olsa
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 ` Jiri Olsa [this message]
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-29-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