INIT_GUI_ERRLISTS;
static char *stat_content[NUM_STAT_ITEMS];
-static int signal_pipe;
-
static struct gui_window {
WINDOW *win;
} top, bot, sb, in, sep;
static struct gui_args_info conf;
static int loglevel;
-enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
-
+enum cmd_status {
+ CMDS_IDLE, /* no command running */
+ CMDS_DCMD, /* para or display command running */
+ CMDS_XCMD, /* external command running */
+};
/**
* Codes for various colors.
static struct gui_theme theme;
-static void com_help(void);
-static void com_reread_conf(void);
-static void com_enlarge_top_win(void);
-static void com_shrink_top_win(void);
-static void com_version(void);
-__noreturn static void com_quit(void);
-static void com_refresh(void);
-static void com_ll_incr(void);
-static void com_ll_decr(void);
-static void com_prev_theme(void);
-static void com_next_theme(void);
-static void com_scroll_up(void);
-static void com_scroll_down(void);
-static void com_page_up(void);
-static void com_page_down(void);
-static void com_cancel_scrolling(void);
-static void com_scroll_top(void);
-
-static struct gui_command command_list[] = {
- {
- .key = "?",
- .name = "help",
- .description = "print help",
- .handler = com_help
- }, {
- .key = "+",
- .name = "enlarge_win",
- .description = "enlarge the top window",
- .handler = com_enlarge_top_win
- }, {
- .key = "-",
- .name = "shrink_win",
- .description = "shrink the top window",
- .handler = com_shrink_top_win
- }, {
- .key = "r",
- .name = "reread_conf",
- .description = "reread configuration file",
- .handler = com_reread_conf
- }, {
- .key = "q",
- .name = "quit",
- .description = "exit para_gui",
- .handler = com_quit
- }, {
- .key = "^L",
- .name = "refresh",
- .description = "redraw the screen",
- .handler = com_refresh
- }, {
- .key = ".",
- .name = "next_theme",
- .description = "switch to next theme",
- .handler = com_next_theme
- }, {
- .key = ",",
- .name = "prev_theme",
- .description = "switch to previous stream",
- .handler = com_prev_theme
- }, {
- .key = ">",
- .name = "ll_incr",
- .description = "increase loglevel (decreases verbosity)",
- .handler = com_ll_incr
- }, {
- .key = "<",
- .name = "ll_decr",
- .description = "decrease loglevel (increases verbosity)",
- .handler = com_ll_decr
- }, {
- .key = "V",
- .name = "version",
- .description = "show the para_gui version",
- .handler = com_version
- }, {
- .key = "<up>",
- .name = "scroll_up",
- .description = "scroll up one line",
- .handler = com_scroll_up
- }, {
- .key = "<down>",
- .name = "scroll_down",
- .description = "scroll down one line",
- .handler = com_scroll_down
- }, {
- .key = "<ppage>",
- .name = "page_up",
- .description = "scroll up one page",
- .handler = com_page_up
- }, {
- .key = "<npage>",
- .name = "page_down",
- .description = "scroll down one page",
- .handler = com_page_down
- }, {
- .key = "<home>",
- .name = "scroll_top",
- .description = "scroll to top of buffer",
- .handler = com_scroll_top
- }, {
- .key = "<end>",
- .name = "cancel_scroll",
- .description = "deactivate scroll mode",
- .handler = com_cancel_scrolling
- }, {
- .handler = NULL
- }
+#define GUI_COMMANDS \
+ GUI_COMMAND(help, "?", "print help") \
+ GUI_COMMAND(enlarge_top_win, "+", "enlarge the top window") \
+ GUI_COMMAND(shrink_top_win, "-", "shrink the top window") \
+ GUI_COMMAND(reread_conf, "r", "reread configuration file") \
+ GUI_COMMAND(quit, "q", "exit para_gui") \
+ GUI_COMMAND(refresh, "^L", "redraw the screen") \
+ GUI_COMMAND(next_theme, ".", "switch to next theme") \
+ GUI_COMMAND(prev_theme, ",", "switch to previous theme") \
+ GUI_COMMAND(ll_incr, ">", "increase loglevel (decreases verbosity)") \
+ GUI_COMMAND(ll_decr, "<", "decrease loglevel (increases verbosity)") \
+ GUI_COMMAND(version, "V", "show the para_gui version") \
+ GUI_COMMAND(scroll_up, "<up>", "scroll up one line") \
+ GUI_COMMAND(scroll_down, "<down>", "scroll_down") \
+ GUI_COMMAND(page_up, "<ppage>", "scroll up one page") \
+ GUI_COMMAND(page_down, "<npage>", "scroll down one page") \
+ GUI_COMMAND(scroll_top, "<home>", "scroll to top of buffer") \
+ GUI_COMMAND(cancel_scroll, "<end>", "deactivate scroll mode") \
+
+/* declare command handlers */
+#define GUI_COMMAND(_c, _k, _d) \
+ static void com_ ## _c(void);
+GUI_COMMANDS
+
+#undef GUI_COMMAND
+
+/* define command array */
+#define GUI_COMMAND(_c, _k, _d) \
+ { \
+ .key = _k, \
+ .name = #_c, \
+ .description = _d, \
+ .handler = com_ ## _c \
+ },
+
+static struct gui_command command_list[] = {GUI_COMMANDS {.name = NULL}};
+
+struct input_task {
+ struct task task;
+};
+
+struct status_task {
+ struct task task;
+};
+
+struct cmd_task {
+ struct task task;
};
static int find_cmd_byname(char *name)
}
__printf_2_3 void (*para_log)(int, const char*, ...) = curses_log;
-static void setup_signal_handling(void)
-{
- signal_pipe = para_signal_init();
- para_install_sighandler(SIGINT);
- para_install_sighandler(SIGTERM);
- para_install_sighandler(SIGCHLD);
- para_install_sighandler(SIGWINCH);
- para_install_sighandler(SIGUSR1);
-}
-
static void shutdown_curses(void)
{
def_prog_mode();
}
}
-static void status_post_select(fd_set *rfds)
+static struct timeval next_exec;
+
+static void status_pre_select(struct sched *s, __a_unused struct task *t)
+{
+ if (stat_pipe >= 0)
+ return para_fd_set(stat_pipe, &s->rfds, &s->max_fileno);
+ sched_request_barrier_or_min_delay(&next_exec, s);
+}
+
+static int status_post_select(struct sched *s, __a_unused struct task *t)
{
static char *buf;
static int bufsize, loaded;
- int ret, ret2;
size_t sz;
+ pid_t pid;
+ int ret, ret2;
+
+ if (stat_pipe < 0) {
+ int fds[3] = {0, 1, 0};
+ /* Avoid busy loop */
+ if (tv_diff(&next_exec, now, NULL) > 0)
+ return 0;
+ next_exec.tv_sec = now->tv_sec + 2;
+ ret = para_exec_cmdline_pid(&pid, conf.stat_cmd_arg, fds);
+ if (ret < 0)
+ return 0;
+ ret = mark_fd_nonblocking(fds[1]);
+ if (ret < 0) {
+ close(fds[1]);
+ return 0;
+ }
+ stat_pipe = fds[1];
+ return 0;
+ }
- if (stat_pipe < 0)
- return;
if (loaded >= bufsize) {
if (bufsize > 1000 * 1000) {
loaded = 0;
- return;
+ return 0;
}
bufsize += bufsize + 1000;
buf = para_realloc(buf, bufsize);
}
assert(loaded < bufsize);
ret = read_nonblock(stat_pipe, buf + loaded, bufsize - loaded,
- rfds, &sz);
+ &s->rfds, &sz);
loaded += sz;
ret2 = for_each_stat_item(buf, loaded, update_item);
if (ret < 0 || ret2 < 0) {
stat_content[SI_BASENAME] =
para_strdup("stat command terminated!?");
print_all_items();
- return;
+ return 0;
}
sz = ret2; /* what is left */
if (sz > 0 && sz < loaded)
memmove(buf, buf + loaded - sz, sz);
loaded = sz;
+ return 0;
}
/*
ret = para_reap_child(&pid);
if (ret <= 0)
return;
- if (pid == cmd_pid)
+ if (pid == cmd_pid) {
cmd_pid = 0;
+ init_curses();
+ print_in_bar(COLOR_MSG, " ");
+ }
goto reap_next_child;
}
/*
* React to various signal-related events
*/
-static void handle_signal(int sig)
+static int signal_post_select(struct sched *s, __a_unused struct task *t)
{
- switch (sig) {
+ int ret = para_next_signal(&s->rfds);
+
+ if (ret <= 0)
+ return 0;
+ switch (ret) {
case SIGTERM:
die(EXIT_FAILURE, "only the good die young (caught SIGTERM)\n");
- return;
+ return 1;
case SIGWINCH:
if (curses_active()) {
shutdown_curses();
init_curses();
redraw_bot_win();
}
- return;
+ return 1;
case SIGINT:
PARA_WARNING_LOG("caught SIGINT, reset\n");
/* Nothing to do. SIGINT killed our child which gets noticed
* by do_select and resets everything.
*/
- return;
+ return 1;
case SIGUSR1:
PARA_NOTICE_LOG("got SIGUSR1, rereading configuration\n");
reread_conf();
- return;
+ return 1;
case SIGCHLD:
check_sigchld();
- return;
+ return 1;
}
+ return 1;
}
-static void status_pre_select(fd_set *rfds, int *max_fileno, struct timeval *tv)
-{
- static struct timeval next_exec, atm, diff;
- int ret, fds[3] = {0, 1, 0};
- pid_t pid;
+#define COMMAND_BUF_SIZE 32768
- if (stat_pipe >= 0)
- goto success;
- /* Avoid busy loop */
- gettimeofday(&atm, NULL);
- if (tv_diff(&next_exec, &atm, &diff) > 0) {
- if (tv_diff(&diff, tv, NULL) < 0)
- *tv = diff;
- return;
- }
- next_exec.tv_sec = atm.tv_sec + 2;
- ret = para_exec_cmdline_pid(&pid, conf.stat_cmd_arg, fds);
- if (ret < 0)
- return;
- ret = mark_fd_nonblocking(fds[1]);
- if (ret < 0) {
- close(fds[1]);
- return;
- }
- stat_pipe = fds[1];
-success:
- para_fd_set(stat_pipe, rfds, max_fileno);
+static enum cmd_status cmd_status(void)
+{
+ if (command_fds[0] >= 0 || command_fds[1] >= 0)
+ return CMDS_DCMD;
+ if (cmd_pid > 0)
+ return CMDS_XCMD;
+ return CMDS_IDLE;
}
-#define COMMAND_BUF_SIZE 32768
-
-static void command_pre_select(int mode, fd_set *rfds, int *max_fileno)
+static void command_pre_select(struct sched *s, __a_unused struct task *t)
{
- /* check command pipe only in COMMAND_MODE */
- if (mode != COMMAND_MODE)
+ enum cmd_status cmds = cmd_status();
+
+ if (cmds != CMDS_DCMD)
return;
if (command_fds[0] >= 0)
- para_fd_set(command_fds[0], rfds, max_fileno);
+ para_fd_set(command_fds[0], &s->rfds, &s->max_fileno);
if (command_fds[1] >= 0)
- para_fd_set(command_fds[1], rfds, max_fileno);
+ para_fd_set(command_fds[1], &s->rfds, &s->max_fileno);
}
-static int command_post_select(int mode, fd_set *rfds)
+static int command_post_select(struct sched *s, __a_unused struct task *t)
{
int i, ret;
static char command_buf[2][COMMAND_BUF_SIZE];
static int cbo[2]; /* command buf offsets */
static unsigned flags[2]; /* for for_each_line() */
+ enum cmd_status cmds = cmd_status();
- if (mode != COMMAND_MODE)
+ if (cmds != CMDS_DCMD)
return 0;
for (i = 0; i < 2; i++) {
size_t sz;
continue;
ret = read_nonblock(command_fds[i],
command_buf[i] + cbo[i],
- COMMAND_BUF_SIZE - 1 - cbo[i], rfds, &sz);
+ COMMAND_BUF_SIZE - 1 - cbo[i], &s->rfds, &sz);
cbo[i] += sz;
sz = cbo[i];
cbo[i] = for_each_line(flags[i], command_buf[i], cbo[i],
wrefresh(bot.win);
flags[i] = 0;
}
- if (ret < 0) {
- PARA_NOTICE_LOG("closing command fd %d: %s",
- i, para_strerror(-ret));
+ if (ret < 0 || cmd_pid == 0) {
+ if (ret < 0)
+ PARA_NOTICE_LOG("closing command fd %d: %s",
+ i, para_strerror(-ret));
close(command_fds[i]);
command_fds[i] = -1;
flags[i] = 0;
cbo[i] = 0;
if (command_fds[!i] < 0) /* both fds closed */
- return -1;
+ return 1;
}
if (cbo[i] == COMMAND_BUF_SIZE - 1) {
PARA_NOTICE_LOG("discarding overlong line");
flags[i] = FELF_DISCARD_FIRST;
}
}
- return 1;
+ return 0;
}
-/*
- * This is the core select loop. Besides the (internal) signal
- * pipe, the following other fds are checked according to the mode:
- *
- * GETCH_MODE: check stdin, return when key is pressed
- *
- * COMMAND_MODE: check command fds and stdin. Return when peer has closed both
- * stdout and stderr or when any key is pressed.
- *
- * EXTERNAL_MODE: Check only signal pipe. Used when an external command
- * is running. During that time curses is disabled. Returns when
- * cmd_pid == 0.
- */
-static int do_select(int mode)
-{
- fd_set rfds;
- int ret, max_fileno;
- struct timeval tv;
-
-repeat:
- tv.tv_sec = conf.timeout_arg / 1000;
- tv.tv_usec = (conf.timeout_arg % 1000) * 1000;
-// ret = refresh_status();
- FD_ZERO(&rfds);
- max_fileno = 0;
- status_pre_select(&rfds, &max_fileno, &tv);
- /* signal pipe */
- para_fd_set(signal_pipe, &rfds, &max_fileno);
- command_pre_select(mode, &rfds, &max_fileno);
- if (mode == GETCH_MODE || mode == COMMAND_MODE)
- para_fd_set(STDIN_FILENO, &rfds, &max_fileno);
- ret = para_select(max_fileno + 1, &rfds, NULL, &tv);
- if (ret <= 0)
- goto check_return; /* skip fd checks */
- /* signals */
- ret = para_next_signal(&rfds);
- if (ret > 0)
- handle_signal(ret);
- /* read command pipe if ready */
- ret = command_post_select(mode, &rfds);
- if (ret < 0)
- return 0;
- status_post_select(&rfds);
-check_return:
- switch (mode) {
- case COMMAND_MODE:
- ret = wgetch(top.win);
- if (ret != ERR && ret != KEY_RESIZE) {
- if (cmd_pid)
- kill(cmd_pid, SIGTERM);
- return -1;
- }
- break;
- case GETCH_MODE:
- ret = wgetch(top.win);
- if (ret != ERR && ret != KEY_RESIZE)
- return ret;
- break;
- case EXTERNAL_MODE:
- if (cmd_pid == 0)
- return 0;
- }
- goto repeat;
+static void input_pre_select(struct sched *s, __a_unused struct task *t)
+{
+ enum cmd_status cmds = cmd_status();
+
+ if (cmds != CMDS_XCMD)
+ para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
}
/* read from command pipe and print data to bot window */
goto fail;
command_fds[0] = fds[1];
command_fds[1] = fds[2];
- if (do_select(COMMAND_MODE) >= 0)
- PARA_INFO_LOG("command complete\n");
- else
- PARA_NOTICE_LOG("command aborted\n");
- print_in_bar(COLOR_MSG, " ");
return;
fail:
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
if (cmd_pid)
return;
shutdown_curses();
- if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0)
+ para_exec_cmdline_pid(&cmd_pid, cmd, fds);
+}
+
+static void handle_command(int c)
+{
+ int i;
+
+ /* first check user-defined key bindings */
+ for (i = 0; i < conf.key_map_given; ++i) {
+ char *tmp, *handler, *arg;
+
+ tmp = para_strdup(conf.key_map_arg[i]);
+ if (!split_key_map(tmp, &handler, &arg)) {
+ free(tmp);
+ return;
+ }
+ if (strcmp(tmp, km_keyname(c))) {
+ free(tmp);
+ continue;
+ }
+ if (*handler == 'd')
+ display_cmd(arg);
+ else if (*handler == 'x')
+ external_cmd(arg);
+ else if (*handler == 'p')
+ para_cmd(arg);
+ else if (*handler == 'i') {
+ int num = find_cmd_byname(arg);
+ if (num >= 0)
+ command_list[num].handler();
+ }
+ free(tmp);
return;
- do_select(EXTERNAL_MODE);
- init_curses();
+ }
+ /* not found, check internal key bindings */
+ for (i = 0; command_list[i].handler; i++) {
+ if (!strcmp(km_keyname(c), command_list[i].key)) {
+ command_list[i].handler();
+ return;
+ }
+ }
+ print_in_bar(COLOR_ERRMSG, "key '%s' is not bound, press ? for help",
+ km_keyname(c));
+}
+
+static int input_post_select(__a_unused struct sched *s, __a_unused struct task *t)
+{
+ int ret;
+ enum cmd_status cmds = cmd_status();
+
+ if (cmds == CMDS_XCMD)
+ return 0;
+ ret = wgetch(top.win);
+ if (ret == ERR || ret == KEY_RESIZE)
+ return 0;
+ if (cmds == CMDS_IDLE) {
+ handle_command(ret);
+ return 0;
+ }
+ if (cmd_pid != 0)
+ kill(cmd_pid, SIGTERM);
+ return 0;
+}
+
+static void signal_pre_select(struct sched *s, struct task *t)
+{
+ struct signal_task *st = container_of(t, struct signal_task, task);
+ para_fd_set(st->fd, &s->rfds, &s->max_fileno);
}
static void print_scroll_msg(void)
print_in_bar(COLOR_ERRMSG, "top of buffer is shown\n");
}
-static void com_cancel_scrolling(void)
+static void com_cancel_scroll(void)
{
if (scroll_position == 0) {
com_refresh();
}
-static void handle_command(int c)
-{
- int i;
-
- /* first check user-defined key bindings */
- for (i = 0; i < conf.key_map_given; ++i) {
- char *tmp, *handler, *arg;
-
- tmp = para_strdup(conf.key_map_arg[i]);
- if (!split_key_map(tmp, &handler, &arg)) {
- free(tmp);
- return;
- }
- if (strcmp(tmp, km_keyname(c))) {
- free(tmp);
- continue;
- }
- if (*handler == 'd')
- display_cmd(arg);
- else if (*handler == 'x')
- external_cmd(arg);
- else if (*handler == 'p')
- para_cmd(arg);
- else if (*handler == 'i') {
- int num = find_cmd_byname(arg);
- if (num >= 0)
- command_list[num].handler();
- }
- free(tmp);
- return;
- }
- /* not found, check internal key bindings */
- for (i = 0; command_list[i].handler; i++) {
- if (!strcmp(km_keyname(c), command_list[i].key)) {
- command_list[i].handler();
- return;
- }
- }
- print_in_bar(COLOR_ERRMSG, "key '%s' is not bound, press ? for help",
- km_keyname(c));
-}
-
__noreturn static void print_help_and_die(void)
{
struct ggo_help h = DEFINE_GGO_HELP(gui);
exit(0);
}
-int main(int argc, char *argv[])
+static int setup_tasks_and_schedule(void)
{
- int ret;
+ struct sched sched = {
+ .default_timeout = {
+ .tv_sec = conf.timeout_arg / 1000,
+ .tv_usec = (conf.timeout_arg % 1000) * 1000,
+ },
+ };
+ struct cmd_task cmd_task = {
+ .task = {
+ .status = "cmd",
+ .pre_select = command_pre_select,
+ .post_select = command_post_select,
+ },
+ };
+ struct status_task status_task = {
+ .task = {
+ .status = "status",
+ .pre_select = status_pre_select,
+ .post_select = status_post_select,
+ },
+ };
+ struct input_task input_task = {
+ .task = {
+ .status = "input",
+ .pre_select = input_pre_select,
+ .post_select = input_post_select,
+ },
+ };
+ struct signal_task signal_task = {
+ .task = {
+ .status = "signal",
+ .pre_select = signal_pre_select,
+ .post_select = signal_post_select,
+ },
+ };
+ signal_task.fd = para_signal_init();
+ para_install_sighandler(SIGINT);
+ para_install_sighandler(SIGTERM);
+ para_install_sighandler(SIGCHLD);
+ para_install_sighandler(SIGWINCH);
+ para_install_sighandler(SIGUSR1);
+
+ register_task(&sched, &cmd_task.task);
+ register_task(&sched, &status_task.task);
+ register_task(&sched, &input_task.task);
+ register_task(&sched, &signal_task.task);
+ return schedule(&sched);
+}
+int main(int argc, char *argv[])
+{
gui_cmdline_parser(argc, argv, &conf); /* exits on errors */
loglevel = get_loglevel_by_name(conf.loglevel_arg);
version_handle_flag("gui", conf.version_given);
if (conf.help_given || conf.detailed_help_given)
print_help_and_die();
parse_config_file_or_die(false /* override */);
- setup_signal_handling();
bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE);
setlocale(LC_CTYPE, "");
initscr(); /* needed only once, always successful */
init_curses();
- for (;;) {
- print_status_bar();
- ret = do_select(GETCH_MODE);
- if (!ret)
- continue;
- print_in_bar(COLOR_MSG, " ");
- handle_command(ret);
- }
+ return setup_tasks_and_schedule() < 0? EXIT_FAILURE : EXIT_SUCCESS;
}
projects / paraslash.git / blobdiff