6 files changed, 25 insertions, 16 deletions

diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
index 52462ae26455..e032716c839b 100644
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -61,6 +61,9 @@ OPTIONS
 -r::
 --realtime=::
         Collect data with this RT SCHED_FIFO priority.
+-D::
+--no-delay::
+        Collect data without buffering.
 -A::
 --append::
         Append to the output file to do incremental profiling.
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 7069bd3e90b3..df6064ad9bf2 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -49,6 +49,7 @@ static int			pipe_output			=      0;
 static const char               *output_name                    = "perf.data";
 static int                      group                           =      0;
 static int                      realtime_prio                   =      0;
+static bool                     nodelay                         =  false;
 static bool                     raw_samples                     =  false;
 static bool                     sample_id_all_avail             =   true;
 static bool                     system_wide                     =  false;
@@ -307,6 +308,11 @@ static void create_counter(struct perf_evsel *evsel, int cpu)
                 attr->sample_type       |= PERF_SAMPLE_CPU;
         }
 
+        if (nodelay) {
+                attr->watermark = 0;
+                attr->wakeup_events = 1;
+        }
+
         attr->mmap              = track;
         attr->comm              = track;
         attr->inherit           = !no_inherit;
@@ -331,9 +337,6 @@ try_again:
                         else if (err ==  ENODEV && cpu_list) {
                                 die("No such device - did you specify"
                                         " an out-of-range profile CPU?\n");
-                        } else if (err == ENOENT) {
-                                die("%s event is not supported. ",
-                                     event_name(evsel));
                         } else if (err == EINVAL && sample_id_all_avail) {
                                 /*
                                  * Old kernel, no attr->sample_id_type_all field
@@ -480,6 +483,7 @@ static void atexit_header(void)
                         process_buildids();
                 perf_header__write(&session->header, output, true);
                 perf_session__delete(session);
+                perf_evsel_list__delete();
                 symbol__exit();
         }
 }
@@ -845,6 +849,8 @@ const struct option record_options[] = {
                     "record events on existing thread id"),
         OPT_INTEGER('r', "realtime", &realtime_prio,
                     "collect data with this RT SCHED_FIFO priority"),
+        OPT_BOOLEAN('D', "no-delay", &nodelay,
+                    "collect data without buffering"),
         OPT_BOOLEAN('R', "raw-samples", &raw_samples,
                     "collect raw sample records from all opened counters"),
         OPT_BOOLEAN('a', "all-cpus", &system_wide,
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index abd4b8497bc4..29e7ffd85690 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1843,15 +1843,15 @@ static const char *record_args[] = {
         "-f",
         "-m", "1024",
         "-c", "1",
-        "-e", "sched:sched_switch:r",
-        "-e", "sched:sched_stat_wait:r",
-        "-e", "sched:sched_stat_sleep:r",
-        "-e", "sched:sched_stat_iowait:r",
-        "-e", "sched:sched_stat_runtime:r",
-        "-e", "sched:sched_process_exit:r",
-        "-e", "sched:sched_process_fork:r",
-        "-e", "sched:sched_wakeup:r",
-        "-e", "sched:sched_migrate_task:r",
+        "-e", "sched:sched_switch",
+        "-e", "sched:sched_stat_wait",
+        "-e", "sched:sched_stat_sleep",
+        "-e", "sched:sched_stat_iowait",
+        "-e", "sched:sched_stat_runtime",
+        "-e", "sched:sched_process_exit",
+        "-e", "sched:sched_process_fork",
+        "-e", "sched:sched_wakeup",
+        "-e", "sched:sched_migrate_task",
 };
 
 static int __cmd_record(int argc, const char **argv)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index c385a63ebfd1..0ff11d9b13be 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -743,6 +743,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used)
 out_free_fd:
         list_for_each_entry(pos, &evsel_list, node)
                 perf_evsel__free_stat_priv(pos);
+        perf_evsel_list__delete();
 out:
         thread_map__delete(threads);
         threads = NULL;
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 6ce4042421bd..05344c6210ac 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1247,8 +1247,6 @@ try_again:
                                 die("Permission error - are you root?\n"
                                         "\t Consider tweaking"
                                         " /proc/sys/kernel/perf_event_paranoid.\n");
-                        if (err == ENOENT)
-                                die("%s event is not supported. ", event_name(evsel));
                         /*
                          * If it's cycles then fall back to hrtimer
                          * based cpu-clock-tick sw counter, which
@@ -1473,6 +1471,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
                 pos->attr.sample_period = default_interval;
         }
 
+        sym_evsel = list_entry(evsel_list.next, struct perf_evsel, node);
+
         symbol_conf.priv_size = (sizeof(struct sym_entry) +
                                  (nr_counters + 1) * sizeof(unsigned long));
 
@@ -1490,6 +1490,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
 out_free_fd:
         list_for_each_entry(pos, &evsel_list, node)
                 perf_evsel__free_mmap(pos);
+        perf_evsel_list__delete();
 
         return status;
 }
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 5b1ecd66bb36..595d0f4a7103 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -286,8 +286,6 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
         status = p->fn(argc, argv, prefix);
         exit_browser(status);
 
-        perf_evsel_list__delete();
-
         if (status)
                 return status & 0xff;