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

Commit 3abebc55 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf record: Let user have timestamps with per-thread recording 



If the option -T is used with option --per-thread, then time is still
not sampled.  Fix that by using OPT_BOOLEAN_SET to distinguish when the
user used the -T option as opposed to the default case when timestamps
are enabled but only for per-cpu recording.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1436183461-1918-1-git-send-email-adrian.hunter@intel.com


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

tools/perf/builtin-record.c

+3 −1
Original line number Diff line number Diff line
@@ -1030,7 +1030,9 @@ struct option __record_options[] = { 
	OPT_BOOLEAN('s', "stat", &record.opts.inherit_stat,

		    "per thread counts"),

	OPT_BOOLEAN('d', "data", &record.opts.sample_address, "Record the sample addresses"),

	OPT_BOOLEAN('T', "timestamp", &record.opts.sample_time, "Record the sample timestamps"),

	OPT_BOOLEAN_SET('T', "timestamp", &record.opts.sample_time,

			&record.opts.sample_time_set,

			"Record the sample timestamps"),

	OPT_BOOLEAN('P', "period", &record.opts.period, "Record the sample period"),

	OPT_BOOLEAN('n', "no-samples", &record.opts.no_samples,

		    "don't sample"),

tools/perf/perf.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ struct record_opts { 
	bool	     sample_address;

	bool	     sample_weight;

	bool	     sample_time;

	bool	     sample_time_set;

	bool	     period;

	bool	     sample_intr_regs;

	bool	     running_time;

tools/perf/util/evsel.c

+2 −1
Original line number Diff line number Diff line
@@ -707,7 +707,8 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts) 
	 */

	if (opts->sample_time &&

	    (!perf_missing_features.sample_id_all &&

	    (!opts->no_inherit || target__has_cpu(&opts->target) || per_cpu)))

	    (!opts->no_inherit || target__has_cpu(&opts->target) || per_cpu ||

	     opts->sample_time_set)))

		perf_evsel__set_sample_bit(evsel, TIME);



	if (opts->raw_samples && !evsel->no_aux_samples) {