perf ui browser: Handle SIGWINCH (3af6e338) · Commits · 戴 / test

tools/perf/builtin-top.c

+18 −3

Original line number	Diff line number	Diff line
		@@ -585,16 +585,31 @@ static void display_thread(void arg __used)
		tc.c_cc[VMIN] = 0;
		tc.c_cc[VTIME] = 0;

		pthread__unblock_sigwinch();
		repeat:
		delay_msecs = top.delay_secs * 1000;
		tcsetattr(0, TCSANOW, &tc);
		/* trash return*/
		getc(stdin);

		do {
		while (1) {
		print_sym_table();
		} while (!poll(&stdin_poll, 1, delay_msecs) == 1);

		/*
		* Either timeout expired or we got an EINTR due to SIGWINCH,
		* refresh screen in both cases.
		*/
		switch (poll(&stdin_poll, 1, delay_msecs)) {
		case 0:
		continue;
		case -1:
		if (errno == EINTR)
		continue;
		/* Fall trhu */
		default:
		goto process_hotkey;
		}
		}
		process_hotkey:
		c = getc(stdin);
		tcsetattr(0, TCSAFLUSH, &save);

tools/perf/perf.c

+24 −0

Original line number	Diff line number	Diff line
		@@ -427,6 +427,24 @@ static void get_debugfs_mntpt(void)
		debugfs_mntpt[0] = '\0';
		}

		static void pthread__block_sigwinch(void)
		{
		sigset_t set;

		sigemptyset(&set);
		sigaddset(&set, SIGWINCH);
		pthread_sigmask(SIG_BLOCK, &set, NULL);
		}

		void pthread__unblock_sigwinch(void)
		{
		sigset_t set;

		sigemptyset(&set);
		sigaddset(&set, SIGWINCH);
		pthread_sigmask(SIG_UNBLOCK, &set, NULL);
		}

		int main(int argc, const char **argv)
		{
		const char *cmd;
		@@ -480,6 +498,12 @@ int main(int argc, const char **argv)
		* time.
		*/
		setup_path();
		/*
		* Block SIGWINCH notifications so that the thread that wants it can
		* unblock and get syscalls like select interrupted instead of waiting
		* forever while the signal goes to some other non interested thread.
		*/
		pthread__block_sigwinch();

		while (1) {
		static int done_help;

tools/perf/perf.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -183,4 +183,6 @@ struct ip_callchain {
		extern bool perf_host, perf_guest;
		extern const char perf_version_string[];

		void pthread__unblock_sigwinch(void);

		#endif

tools/perf/util/ui/browser.c

+90 −47

Original line number	Diff line number	Diff line
		#include "../util.h"
		#include "../../perf.h"
		#include "libslang.h"
		#include <newt.h>
		#include "ui.h"
		#include <linux/compiler.h>
		#include <linux/list.h>
		@@ -8,8 +11,8 @@
		#include "browser.h"
		#include "helpline.h"
		#include "../color.h"
		#include "../util.h"
		#include <stdio.h>

		int newtGetKey(void);

		static int ui_browser__percent_color(double percent, bool current)
		{
		@@ -127,11 +130,8 @@ bool ui_browser__is_current_entry(struct ui_browser *self, unsigned row)

		void ui_browser__refresh_dimensions(struct ui_browser *self)
		{
		int cols, rows;
		newtGetScreenSize(&cols, &rows);

		self->width = cols - 1;
		self->height = rows - 2;
		self->width = SLtt_Screen_Cols - 1;
		self->height = SLtt_Screen_Rows - 2;
		self->y = 1;
		self->x = 0;
		}
		@@ -142,9 +142,8 @@ void ui_browser__reset_index(struct ui_browser *self)
		self->seek(self, 0, SEEK_SET);
		}

		void ui_browser__add_exit_key(struct ui_browser *self, int key)
		void ui_browser__add_exit_key(struct ui_browser *browser __used, int key __used)
		{
		newtFormAddHotKey(self->form, key);
		}

		void ui_browser__add_exit_keys(struct ui_browser *self, int keys[])
		@@ -161,7 +160,7 @@ void __ui_browser__show_title(struct ui_browser browser, const char title)
		{
		SLsmg_gotorc(0, 0);
		ui_browser__set_color(browser, NEWT_COLORSET_ROOT);
		slsmg_write_nstring(title, browser->width);
		slsmg_write_nstring(title, browser->width + 1);
		}

		void ui_browser__show_title(struct ui_browser browser, const char title)
		@@ -174,57 +173,75 @@ void ui_browser__show_title(struct ui_browser browser, const char title)
		int ui_browser__show(struct ui_browser self, const char title,
		const char *helpline, ...)
		{
		int err;
		va_list ap;
		int keys[] = { NEWT_KEY_UP, NEWT_KEY_DOWN, NEWT_KEY_PGUP,
		NEWT_KEY_PGDN, NEWT_KEY_HOME, NEWT_KEY_END, ' ',
		NEWT_KEY_LEFT, NEWT_KEY_ESCAPE, 'q', CTRL('c'), 0 };

		if (self->form != NULL)
		newtFormDestroy(self->form);

		ui_browser__refresh_dimensions(self);
		self->form = newtForm(NULL, NULL, 0);
		if (self->form == NULL)
		return -1;

		self->sb = newtVerticalScrollbar(self->width, 1, self->height,
		HE_COLORSET_NORMAL,
		HE_COLORSET_SELECTED);
		if (self->sb == NULL)
		return -1;

		pthread_mutex_lock(&ui__lock);
		__ui_browser__show_title(self, title);

		ui_browser__add_exit_keys(self, keys);
		newtFormAddComponent(self->form, self->sb);
		self->title = title;
		free(self->helpline);
		self->helpline = NULL;

		va_start(ap, helpline);
		ui_helpline__vpush(helpline, ap);
		err = vasprintf(&self->helpline, helpline, ap);
		va_end(ap);
		if (err > 0)
		ui_helpline__push(self->helpline);
		pthread_mutex_unlock(&ui__lock);
		return 0;
		return err ? 0 : -1;
		}

		void ui_browser__hide(struct ui_browser *self)
		void ui_browser__hide(struct ui_browser *browser __used)
		{
		pthread_mutex_lock(&ui__lock);
		newtFormDestroy(self->form);
		self->form = NULL;
		ui_helpline__pop();
		pthread_mutex_unlock(&ui__lock);
		}

		int ui_browser__refresh(struct ui_browser *self)
		static void ui_browser__scrollbar_set(struct ui_browser *browser)
		{
		int height = browser->height, h = 0, pct = 0,
		col = browser->width,
		row = browser->y - 1;

		if (browser->nr_entries > 1) {
		pct = ((browser->index * (browser->height - 1)) /
		(browser->nr_entries - 1));
		}

		while (h < height) {
		ui_browser__gotorc(browser, row++, col);
		SLsmg_set_char_set(1);
		SLsmg_write_char(h == pct ? SLSMG_DIAMOND_CHAR : SLSMG_BOARD_CHAR);
		SLsmg_set_char_set(0);
		++h;
		}
		}

		static int __ui_browser__refresh(struct ui_browser *browser)
		{
		int row;

		row = browser->refresh(browser);
		ui_browser__set_color(browser, HE_COLORSET_NORMAL);
		SLsmg_fill_region(browser->y + row, browser->x,
		browser->height - row, browser->width, ' ');
		ui_browser__scrollbar_set(browser);

		return 0;
		}

		int ui_browser__refresh(struct ui_browser *browser)
		{
		pthread_mutex_lock(&ui__lock);
		newtScrollbarSet(self->sb, self->index, self->nr_entries - 1);
		row = self->refresh(self);
		ui_browser__set_color(self, HE_COLORSET_NORMAL);
		SLsmg_fill_region(self->y + row, self->x,
		self->height - row, self->width, ' ');
		__ui_browser__refresh(browser);
		pthread_mutex_unlock(&ui__lock);

		return 0;
		@@ -253,21 +270,49 @@ void ui_browser__update_nr_entries(struct ui_browser *browser, u32 nr_entries)
		browser->seek(browser, browser->top_idx, SEEK_SET);
		}

		int ui_browser__run(struct ui_browser *self)
		int ui_browser__run(struct ui_browser *self, int delay_secs)
		{
		struct newtExitStruct es;
		int err, key;
		struct timeval timeout, *ptimeout = delay_secs ? &timeout : NULL;

		if (ui_browser__refresh(self) < 0)
		return -1;
		pthread__unblock_sigwinch();

		while (1) {
		off_t offset;
		fd_set read_set;

		pthread_mutex_lock(&ui__lock);
		err = __ui_browser__refresh(self);
		SLsmg_refresh();
		pthread_mutex_unlock(&ui__lock);
		if (err < 0)
		break;

		newtFormRun(self->form, &es);
		FD_ZERO(&read_set);
		FD_SET(0, &read_set);

		if (es.reason != NEWT_EXIT_HOTKEY)
		if (delay_secs) {
		timeout.tv_sec = delay_secs;
		timeout.tv_usec = 0;
		}

		err = select(1, &read_set, NULL, NULL, ptimeout);
		if (err > 0 && FD_ISSET(0, &read_set))
		key = newtGetKey();
		else if (err == 0)
		break;
		switch (es.u.key) {
		else {
		pthread_mutex_lock(&ui__lock);
		SLtt_get_screen_size();
		SLsmg_reinit_smg();
		pthread_mutex_unlock(&ui__lock);
		ui_browser__refresh_dimensions(self);
		__ui_browser__show_title(self, self->title);
		ui_helpline__puts(self->helpline);
		continue;
		}

		switch (key) {
		case NEWT_KEY_DOWN:
		if (self->index == self->nr_entries - 1)
		break;
		@@ -324,10 +369,8 @@ int ui_browser__run(struct ui_browser *self)
		self->seek(self, -offset, SEEK_END);
		break;
		default:
		return es.u.key;
		return key;
		}
		if (ui_browser__refresh(self) < 0)
		return -1;
		}
		return -1;
		}
		@@ -353,13 +396,13 @@ unsigned int ui_browser__list_head_refresh(struct ui_browser *self)
		return row;
		}

		static struct newtPercentTreeColors {
		static struct ui_browser__colors {
		const char topColorFg, topColorBg;
		const char mediumColorFg, mediumColorBg;
		const char normalColorFg, normalColorBg;
		const char selColorFg, selColorBg;
		const char codeColorFg, codeColorBg;
		} defaultPercentTreeColors = {
		} ui_browser__default_colors = {
		"red", "lightgray",
		"green", "lightgray",
		"black", "lightgray",
		@@ -369,7 +412,7 @@ static struct newtPercentTreeColors {

		void ui_browser__init(void)
		{
		struct newtPercentTreeColors *c = &defaultPercentTreeColors;
		struct ui_browser__colors *c = &ui_browser__default_colors;

		sltt_set_color(HE_COLORSET_TOP, NULL, c->topColorFg, c->topColorBg);
		sltt_set_color(HE_COLORSET_MEDIUM, NULL, c->mediumColorFg, c->mediumColorBg);

tools/perf/util/ui/browser.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		#define _PERF_UI_BROWSER_H_ 1

		#include <stdbool.h>
		#include <newt.h>
		#include <sys/types.h>
		#include "../types.h"

		@@ -13,11 +12,12 @@
		#define HE_COLORSET_CODE 54

		struct ui_browser {
		newtComponent form, sb;
		u64 index, top_idx;
		void top, entries;
		u16 y, x, width, height;
		void *priv;
		const char *title;
		char *helpline;
		unsigned int (refresh)(struct ui_browser self);
		void (write)(struct ui_browser self, void *entry, int row);
		void (seek)(struct ui_browser self, off_t offset, int whence);
		@@ -40,7 +40,7 @@ int ui_browser__show(struct ui_browser self, const char title,
		const char *helpline, ...);
		void ui_browser__hide(struct ui_browser *self);
		int ui_browser__refresh(struct ui_browser *self);
		int ui_browser__run(struct ui_browser *self);
		int ui_browser__run(struct ui_browser *browser, int delay_secs);
		void ui_browser__update_nr_entries(struct ui_browser *browser, u32 nr_entries);

		void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence);

Admin message