lkml.org 
[lkml]   [2018]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 035/193] perf top: Fix window dimensions change handling
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jiri Olsa <jolsa@kernel.org>


    [ Upstream commit 89d0aeab4252adc2a7ea693637dd21c588bfa2d1 ]

    The stdio perf top crashes when we change the terminal
    window size. The reason is that we assumed we get the
    perf_top pointer as a signal handler argument which is
    not the case.

    Changing the SIGWINCH handler logic to change global
    resize variable, which is checked in the main thread
    loop.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Tested-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Andi Kleen <andi@firstfloor.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Wang Nan <wangnan0@huawei.com>
    Link: http://lkml.kernel.org/n/tip-ysuzwz77oev1ftgvdscn9bpu@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    tools/perf/builtin-top.c | 15 ++++++++++++---
    1 file changed, 12 insertions(+), 3 deletions(-)

    --- a/tools/perf/builtin-top.c
    +++ b/tools/perf/builtin-top.c
    @@ -70,6 +70,7 @@
    #include <linux/types.h>

    static volatile int done;
    +static volatile int resize;

    #define HEADER_LINE_NR 5

    @@ -79,10 +80,13 @@ static void perf_top__update_print_entri
    }

    static void perf_top__sig_winch(int sig __maybe_unused,
    - siginfo_t *info __maybe_unused, void *arg)
    + siginfo_t *info __maybe_unused, void *arg __maybe_unused)
    {
    - struct perf_top *top = arg;
    + resize = 1;
    +}

    +static void perf_top__resize(struct perf_top *top)
    +{
    get_term_dimensions(&top->winsize);
    perf_top__update_print_entries(top);
    }
    @@ -466,7 +470,7 @@ static bool perf_top__handle_keypress(st
    .sa_sigaction = perf_top__sig_winch,
    .sa_flags = SA_SIGINFO,
    };
    - perf_top__sig_winch(SIGWINCH, NULL, top);
    + perf_top__resize(top);
    sigaction(SIGWINCH, &act, NULL);
    } else {
    signal(SIGWINCH, SIG_DFL);
    @@ -1023,6 +1027,11 @@ static int __cmd_top(struct perf_top *to

    if (hits == top->samples)
    ret = perf_evlist__poll(top->evlist, 100);
    +
    + if (resize) {
    + perf_top__resize(top);
    + resize = 0;
    + }
    }

    ret = 0;

    \
     
     \ /
      Last update: 2018-02-23 21:35    [W:2.997 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site