Commit-ID: 3abebc55d70b6e3247d1f0e34c0bb906e40d2a18 Gitweb: http://git.kernel.org/tip/3abebc55d70b6e3247d1f0e34c0bb906e40d2a18 Author: Adrian Hunter <adrian.hun...@intel.com> AuthorDate: Mon, 6 Jul 2015 14:51:01 +0300 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Mon, 6 Jul 2015 08:58:36 -0300
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: Adrian Hunter <adrian.hun...@intel.com> Cc: David Ahern <dsah...@gmail.com> Cc: Jiri Olsa <jo...@redhat.com> Cc: Namhyung Kim <namhy...@kernel.org> Link: http://lkml.kernel.org/r/1436183461-1918-1-git-send-email-adrian.hun...@intel.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/builtin-record.c | 4 +++- tools/perf/perf.h | 1 + tools/perf/util/evsel.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index de165a1..283fe96 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -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"), diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 4a5827ff..937b16a 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -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; diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 6cc97f3..83c0803 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -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) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
