We can't display the UI box saying that we are slow in reader
thread. That will make perf top even slower and user even more
angry ;-)

Moving the UI box message out of the reader thread into UI thread
and changing it into helpline, so there's no 'press any key'
necessary.

Link: http://lkml.kernel.org/n/tip-0rpmmt3omlait889ewp1c...@git.kernel.org
Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
 tools/perf/builtin-top.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 047e99de09f3..1d77aa7650da 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -553,8 +553,6 @@ static void perf_top__sort_new_samples(void *arg)
        struct perf_evsel *evsel = t->sym_evsel;
        struct hists *hists;
 
-       perf_top__reset_sample_counters(t);
-
        if (t->evlist->selected != NULL)
                t->sym_evsel = t->evlist->selected;
 
@@ -571,6 +569,11 @@ static void perf_top__sort_new_samples(void *arg)
 
        hists__collapse_resort(hists, NULL);
        perf_evsel__output_resort(evsel, NULL);
+
+       if (t->lost)
+               ui_helpline__fpush("Too slow to read ring buffer (change period 
(-c/-F) or limit CPUs (-C)\n");
+
+       perf_top__reset_sample_counters(t);
 }
 
 static void *display_thread_tui(void *arg)
@@ -908,10 +911,8 @@ static void perf_top__mmap_read(struct perf_top *top)
 {
        bool overwrite = top->record_opts.overwrite;
        struct perf_evlist *evlist = top->evlist;
-       unsigned long long start, end;
        int i;
 
-       start = rdclock();
        if (overwrite)
                perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_DATA_PENDING);
 
@@ -922,13 +923,6 @@ static void perf_top__mmap_read(struct perf_top *top)
                perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_EMPTY);
                perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_RUNNING);
        }
-       end = rdclock();
-
-       if ((end - start) > (unsigned long long)top->delay_secs * NSEC_PER_SEC)
-               ui__warning("Too slow to read ring buffer.\n"
-                           "Please try increasing the period (-c) or\n"
-                           "decreasing the freq (-F) or\n"
-                           "limiting the number of CPUs (-C)\n");
 }
 
 /*
-- 
2.17.2

Reply via email to