Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1305311

[tip:perf/core] perf script: Add stat default handlers

Show all headers | View raw

Commit-ID:  e099eba8c8df0f96e7cd6ddc5fc3151fe37be24e
Gitweb:     http://git.kernel.org/tip/e099eba8c8df0f96e7cd6ddc5fc3151fe37be24e
Author:     Jiri Olsa <jolsa@kernel.org>
AuthorDate: Tue, 5 Jan 2016 22:09:09 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 6 Jan 2016 20:11:15 -0300

perf script: Add stat default handlers

Implement struct scripting_ops::(process_stat|process_stat_interval)
handlers - calling scripting handlers from stat events handlers.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Kan 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/1452028152-26762-6-git-send-email-jolsa@kernel.org
[ Rename 'time' parameters to 'tstamp', to fix the build in older distros ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-script.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index a90bc0b..5e18654 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -221,6 +221,9 @@ static int perf_evsel__check_attr(struct perf_evsel *evsel,
 	struct perf_event_attr *attr = &evsel->attr;
 	bool allow_user_set;
 
+	if (perf_header__has_feat(&session->header, HEADER_STAT))
+		return 0;
+
 	allow_user_set = perf_header__has_feat(&session->header,
 					       HEADER_AUXTRACE);
 
@@ -674,6 +677,18 @@ static void process_event(struct perf_script *script __maybe_unused, union perf_
 
 static struct scripting_ops	*scripting_ops;
 
+static void process_stat(struct perf_evsel *counter, u64 tstamp)
+{
+	if (scripting_ops && scripting_ops->process_stat)
+		scripting_ops->process_stat(&stat_config, counter, tstamp);
+}
+
+static void process_stat_interval(u64 tstamp)
+{
+	if (scripting_ops && scripting_ops->process_stat_interval)
+		scripting_ops->process_stat_interval(tstamp);
+}
+
 static void setup_scripting(void)
 {
 	setup_perl_scripting();
@@ -1690,6 +1705,22 @@ static void script__setup_sample_type(struct perf_script *script)
 	}
 }
 
+static int process_stat_round_event(struct perf_tool *tool __maybe_unused,
+				    union perf_event *event,
+				    struct perf_session *session)
+{
+	struct stat_round_event *round = &event->stat_round;
+	struct perf_evsel *counter;
+
+	evlist__for_each(session->evlist, counter) {
+		perf_stat_process_counter(&stat_config, counter);
+		process_stat(counter, round->time);
+	}
+
+	process_stat_interval(round->time);
+	return 0;
+}
+
 static int process_stat_config_event(struct perf_tool *tool __maybe_unused,
 				     union perf_event *event,
 				     struct perf_session *session __maybe_unused)
@@ -1783,6 +1814,8 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)
 			.auxtrace_info	 = perf_event__process_auxtrace_info,
 			.auxtrace	 = perf_event__process_auxtrace,
 			.auxtrace_error	 = perf_event__process_auxtrace_error,
+			.stat		 = perf_event__process_stat_event,
+			.stat_round	 = process_stat_round_event,
 			.stat_config	 = process_stat_config_event,
 			.thread_map	 = process_thread_map_event,
 			.cpu_map	 = process_cpu_map_event,

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCHv8 0/8] perf stat: Add scripting support Jiri Olsa <jolsa@kernel.org> - 2016-01-05 22:20 +0100
  [PATCH 5/8] perf script: Add stat default handlers Jiri Olsa <jolsa@kernel.org> - 2016-01-05 22:20 +0100
    [tip:perf/core] perf script: Add stat default handlers tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-01-09 17:40 +0100
  [PATCH 1/8] perf stat record: Keep sample_type 0 for pipe session Jiri Olsa <jolsa@kernel.org> - 2016-01-05 22:20 +0100
    [tip:perf/core] perf stat record:   Keep sample_type 0 for pipe session tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-01-09 17:30 +0100
  [PATCH 8/8] perf script: Add stat-cpi.py script Jiri Olsa <jolsa@kernel.org> - 2016-01-05 22:20 +0100
    Re: [PATCH 8/8] perf script: Add stat-cpi.py script Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-06 00:00 +0100
  [PATCH 6/8] perf script: Display stat events by default Jiri Olsa <jolsa@kernel.org> - 2016-01-05 22:20 +0100
    Re: [PATCH 6/8] perf script: Display stat events by default Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-05 23:50 +0100
      Re: [PATCH 6/8] perf script: Display stat events by default Jiri Olsa <jolsa@redhat.com> - 2016-01-06 10:40 +0100
  [PATCH 2/8] perf script: Process cpu/threads maps Jiri Olsa <jolsa@kernel.org> - 2016-01-05 22:20 +0100
    [tip:perf/core] perf script: Process cpu/threads maps tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-01-09 17:30 +0100
  [PATCH 4/8] perf script: Add process_stat/process_stat_interval scripting interface Jiri Olsa <jolsa@kernel.org> - 2016-01-05 22:20 +0100
    [tip:perf/core] perf script: Add process_stat/  process_stat_interval scripting interface tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-01-09 17:40 +0100
  Re: [PATCHv8 0/8] perf stat: Add scripting support Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-05 23:40 +0100
    Re: [PATCHv8 0/8] perf stat: Add scripting support Jiri Olsa <jolsa@redhat.com> - 2016-01-06 10:10 +0100

csiph-web