1 files changed, 51 insertions, 15 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 003255910c05..bf4ca749d1ac 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -51,7 +51,6 @@
 #include <signal.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
-#include <asm/bug.h>
 #include <linux/time64.h>
 
 struct switch_output {
@@ -79,6 +78,7 @@ struct record {
         bool                    no_buildid_cache_set;
         bool                    buildid_all;
         bool                    timestamp_filename;
+        bool                    timestamp_boundary;
         struct switch_output    switch_output;
         unsigned long long      samples;
 };
@@ -301,7 +301,7 @@ static int record__mmap_evlist(struct record *rec,
         struct record_opts *opts = &rec->opts;
         char msg[512];
 
-        if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false,
+        if (perf_evlist__mmap_ex(evlist, opts->mmap_pages,
                                  opts->auxtrace_mmap_pages,
                                  opts->auxtrace_snapshot_mode) < 0) {
                 if (errno == EPERM) {
@@ -372,6 +372,8 @@ try_again:
                         ui__error("%s\n", msg);
                         goto out;
                 }
+
+                pos->supported = true;
         }
 
         if (perf_evlist__apply_filters(evlist, &pos)) {
@@ -408,8 +410,15 @@ static int process_sample_event(struct perf_tool *tool,
 {
         struct record *rec = container_of(tool, struct record, tool);
 
-        rec->samples++;
+        if (rec->evlist->first_sample_time == 0)
+                rec->evlist->first_sample_time = sample->time;
+
+        rec->evlist->last_sample_time = sample->time;
 
+        if (rec->buildid_all)
+                return 0;
+
+        rec->samples++;
         return build_id__mark_dso_hit(tool, event, sample, evsel, machine);
 }
 
@@ -434,9 +443,11 @@ static int process_buildids(struct record *rec)
 
         /*
          * If --buildid-all is given, it marks all DSO regardless of hits,
-         * so no need to process samples.
+         * so no need to process samples. But if timestamp_boundary is enabled,
+         * it still needs to walk on all samples to get the timestamps of
+         * first/last samples.
          */
-        if (rec->buildid_all)
+        if (rec->buildid_all && !rec->timestamp_boundary)
                 rec->tool.sample = NULL;
 
         return perf_session__process_events(session);
@@ -477,7 +488,7 @@ static struct perf_event_header finished_round_event = {
 };
 
 static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evlist,
-                                    bool backward)
+                                    bool overwrite)
 {
         u64 bytes_written = rec->bytes_written;
         int i;
@@ -487,18 +498,18 @@ static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evli
         if (!evlist)
                 return 0;
 
-        maps = backward ? evlist->backward_mmap : evlist->mmap;
+        maps = overwrite ? evlist->overwrite_mmap : evlist->mmap;
         if (!maps)
                 return 0;
 
-        if (backward && evlist->bkw_mmap_state != BKW_MMAP_DATA_PENDING)
+        if (overwrite && evlist->bkw_mmap_state != BKW_MMAP_DATA_PENDING)
                 return 0;
 
         for (i = 0; i < evlist->nr_mmaps; i++) {
                 struct auxtrace_mmap *mm = &maps[i].auxtrace_mmap;
 
                 if (maps[i].base) {
-                        if (perf_mmap__push(&maps[i], evlist->overwrite, backward, rec, record__pushfn) != 0) {
+                        if (perf_mmap__push(&maps[i], overwrite, rec, record__pushfn) != 0) {
                                 rc = -1;
                                 goto out;
                         }
@@ -518,7 +529,7 @@ static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evli
         if (bytes_written != rec->bytes_written)
                 rc = record__write(rec, &finished_round_event, sizeof(finished_round_event));
 
-        if (backward)
+        if (overwrite)
                 perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_EMPTY);
 out:
         return rc;
@@ -690,8 +701,8 @@ perf_evlist__pick_pc(struct perf_evlist *evlist)
         if (evlist) {
                 if (evlist->mmap && evlist->mmap[0].base)
                         return evlist->mmap[0].base;
-                if (evlist->backward_mmap && evlist->backward_mmap[0].base)
-                        return evlist->backward_mmap[0].base;
+                if (evlist->overwrite_mmap && evlist->overwrite_mmap[0].base)
+                        return evlist->overwrite_mmap[0].base;
         }
         return NULL;
 }
@@ -784,6 +795,28 @@ static int record__synthesize(struct record *rec, bool tail)
                                          perf_event__synthesize_guest_os, tool);
         }
 
+        err = perf_event__synthesize_extra_attr(&rec->tool,
+                                                rec->evlist,
+                                                process_synthesized_event,
+                                                data->is_pipe);
+        if (err)
+                goto out;
+
+        err = perf_event__synthesize_thread_map2(&rec->tool, rec->evlist->threads,
+                                                 process_synthesized_event,
+                                                NULL);
+        if (err < 0) {
+                pr_err("Couldn't synthesize thread map.\n");
+                return err;
+        }
+
+        err = perf_event__synthesize_cpu_map(&rec->tool, rec->evlist->cpus,
+                                             process_synthesized_event, NULL);
+        if (err < 0) {
+                pr_err("Couldn't synthesize cpu map.\n");
+                return err;
+        }
+
         err = __machine__synthesize_threads(machine, tool, &opts->target, rec->evlist->threads,
                                             process_synthesized_event, opts->sample_address,
                                             opts->proc_map_timeout, 1);
@@ -1533,7 +1566,8 @@ static struct option __record_options[] = {
         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_SET('P', "period", &record.opts.period, &record.opts.period_set,
+                        "Record the sample period"),
         OPT_BOOLEAN('n', "no-samples", &record.opts.no_samples,
                     "don't sample"),
         OPT_BOOLEAN_SET('N', "no-buildid-cache", &record.no_buildid_cache,
@@ -1598,6 +1632,8 @@ static struct option __record_options[] = {
                     "Record build-id of all DSOs regardless of hits"),
         OPT_BOOLEAN(0, "timestamp-filename", &record.timestamp_filename,
                     "append timestamp to output filename"),
+        OPT_BOOLEAN(0, "timestamp-boundary", &record.timestamp_boundary,
+                    "Record timestamp boundary (time of first/last samples)"),
         OPT_STRING_OPTARG_SET(0, "switch-output", &record.switch_output.str,
                           &record.switch_output.set, "signal,size,time",
                           "Switch output when receive SIGUSR2 or cross size,time threshold",
@@ -1781,8 +1817,8 @@ int cmd_record(int argc, const char **argv)
                 goto out;
         }
 
-        /* Enable ignoring missing threads when -u option is defined. */
-        rec->opts.ignore_missing_thread = rec->opts.target.uid != UINT_MAX;
+        /* Enable ignoring missing threads when -u/-p option is defined. */
+        rec->opts.ignore_missing_thread = rec->opts.target.uid != UINT_MAX || rec->opts.target.pid;
 
         err = -ENOMEM;
         if (perf_evlist__create_maps(rec->evlist, &rec->opts.target) < 0)