Commit 01656ec6 authored by Jiri Olsa's avatar Jiri Olsa Committed by Greg Kroah-Hartman

perf top: Fix window dimensions change handling


[ Upstream commit 89d0aeab ]

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: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: default avatarRavi 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.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d2905b0
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
#include <linux/types.h> #include <linux/types.h>
static volatile int done; static volatile int done;
static volatile int resize;
#define HEADER_LINE_NR 5 #define HEADER_LINE_NR 5
...@@ -79,10 +80,13 @@ static void perf_top__update_print_entries(struct perf_top *top) ...@@ -79,10 +80,13 @@ static void perf_top__update_print_entries(struct perf_top *top)
} }
static void perf_top__sig_winch(int sig __maybe_unused, 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); get_term_dimensions(&top->winsize);
perf_top__update_print_entries(top); perf_top__update_print_entries(top);
} }
...@@ -466,7 +470,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c) ...@@ -466,7 +470,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c)
.sa_sigaction = perf_top__sig_winch, .sa_sigaction = perf_top__sig_winch,
.sa_flags = SA_SIGINFO, .sa_flags = SA_SIGINFO,
}; };
perf_top__sig_winch(SIGWINCH, NULL, top); perf_top__resize(top);
sigaction(SIGWINCH, &act, NULL); sigaction(SIGWINCH, &act, NULL);
} else { } else {
signal(SIGWINCH, SIG_DFL); signal(SIGWINCH, SIG_DFL);
...@@ -1023,6 +1027,11 @@ static int __cmd_top(struct perf_top *top) ...@@ -1023,6 +1027,11 @@ static int __cmd_top(struct perf_top *top)
if (hits == top->samples) if (hits == top->samples)
ret = perf_evlist__poll(top->evlist, 100); ret = perf_evlist__poll(top->evlist, 100);
if (resize) {
perf_top__resize(top);
resize = 0;
}
} }
ret = 0; ret = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment