static unsigned scroll_position;
-static pid_t cmd_pid;
+static pid_t exec_pid;
-static int command_fds[2] = {-1, -1};
-static int stat_pipe = -1;
+static int exec_fds[2] = {-1, -1};
static struct gui_args_info conf;
static int loglevel;
-enum cmd_status {
- CMDS_IDLE, /* no command running */
- CMDS_DCMD, /* para or display command running */
- CMDS_XCMD, /* external command running */
+enum exec_status {
+ EXEC_IDLE, /* no command running */
+ EXEC_DCMD, /* para or display command running */
+ EXEC_XCMD, /* external command running */
};
/**
struct status_task {
struct task task;
+ char *buf;
+ int bufsize, loaded;
+ struct timeval next_exec;
+ int fd;
};
-struct cmd_task {
+#define COMMAND_BUF_SIZE 32768
+
+struct exec_task {
struct task task;
+ char command_buf[2][COMMAND_BUF_SIZE]; /* stdout/stderr of command */
+ int cbo[2]; /* command buf offsets */
+ unsigned flags[2]; /* passed to for_each_line() */
};
static int find_cmd_byname(char *name)
msg[bytes - 1] = '\0'; /* cut trailing newline */
rb_add_entry(color, msg);
wrefresh(bot.win);
- } else if (cmd_pid <= 0) /* no external command running */
+ } else if (exec_pid <= 0) /* no external command running */
vfprintf(stderr, fmt, ap);
va_end(ap);
}
}
}
-static struct timeval next_exec;
-
-static void status_pre_select(struct sched *s, __a_unused struct task *t)
+static void status_pre_select(struct sched *s, 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);
+ struct status_task *st = container_of(t, struct status_task, task);
+
+ if (st->fd >= 0)
+ return para_fd_set(st->fd, &s->rfds, &s->max_fileno);
+ sched_request_barrier_or_min_delay(&st->next_exec, s);
}
-static int status_post_select(struct sched *s, __a_unused struct task *t)
+static int status_post_select(struct sched *s, struct task *t)
{
- static char *buf;
- static int bufsize, loaded;
+ struct status_task *st = container_of(t, struct status_task, task);
size_t sz;
pid_t pid;
int ret, ret2;
- if (stat_pipe < 0) {
+ if (st->fd < 0) {
int fds[3] = {0, 1, 0};
/* Avoid busy loop */
- if (tv_diff(&next_exec, now, NULL) > 0)
+ if (tv_diff(&st->next_exec, now, NULL) > 0)
return 0;
- next_exec.tv_sec = now->tv_sec + 2;
+ st->next_exec.tv_sec = now->tv_sec + 2;
ret = para_exec_cmdline_pid(&pid, conf.stat_cmd_arg, fds);
if (ret < 0)
return 0;
close(fds[1]);
return 0;
}
- stat_pipe = fds[1];
+ st->fd = fds[1];
return 0;
}
- if (loaded >= bufsize) {
- if (bufsize > 1000 * 1000) {
- loaded = 0;
+ if (st->loaded >= st->bufsize) {
+ if (st->bufsize > 1000 * 1000) {
+ st->loaded = 0;
return 0;
}
- bufsize += bufsize + 1000;
- buf = para_realloc(buf, bufsize);
+ st->bufsize += st->bufsize + 1000;
+ st->buf = para_realloc(st->buf, st->bufsize);
}
- assert(loaded < bufsize);
- ret = read_nonblock(stat_pipe, buf + loaded, bufsize - loaded,
- &s->rfds, &sz);
- loaded += sz;
- ret2 = for_each_stat_item(buf, loaded, update_item);
+ assert(st->loaded < st->bufsize);
+ ret = read_nonblock(st->fd, st->buf + st->loaded,
+ st->bufsize - st->loaded, &s->rfds, &sz);
+ st->loaded += sz;
+ ret2 = for_each_stat_item(st->buf, st->loaded, update_item);
if (ret < 0 || ret2 < 0) {
- loaded = 0;
+ st->loaded = 0;
PARA_NOTICE_LOG("closing stat pipe: %s\n", para_strerror(-ret));
- close(stat_pipe);
- stat_pipe = -1;
+ close(st->fd);
+ st->fd = -1;
clear_all_items();
free(stat_content[SI_BASENAME]);
stat_content[SI_BASENAME] =
return 0;
}
sz = ret2; /* what is left */
- if (sz > 0 && sz < loaded)
- memmove(buf, buf + loaded - sz, sz);
- loaded = sz;
+ if (sz > 0 && sz < st->loaded)
+ memmove(st->buf, st->buf + st->loaded - sz, sz);
+ st->loaded = sz;
return 0;
}
ret = para_reap_child(&pid);
if (ret <= 0)
return;
- if (pid == cmd_pid) {
- cmd_pid = 0;
+ if (pid == exec_pid) {
+ exec_pid = 0;
init_curses();
print_in_bar(COLOR_MSG, " ");
}
return 1;
}
-#define COMMAND_BUF_SIZE 32768
-
-static enum cmd_status cmd_status(void)
+static enum exec_status exec_status(void)
{
- if (command_fds[0] >= 0 || command_fds[1] >= 0)
- return CMDS_DCMD;
- if (cmd_pid > 0)
- return CMDS_XCMD;
- return CMDS_IDLE;
+ if (exec_fds[0] >= 0 || exec_fds[1] >= 0)
+ return EXEC_DCMD;
+ if (exec_pid > 0)
+ return EXEC_XCMD;
+ return EXEC_IDLE;
}
-static void command_pre_select(struct sched *s, __a_unused struct task *t)
+static void exec_pre_select(struct sched *s, __a_unused struct task *t)
{
- enum cmd_status cmds = cmd_status();
+ enum exec_status es = exec_status();
- if (cmds != CMDS_DCMD)
+ if (es != EXEC_DCMD)
return;
- if (command_fds[0] >= 0)
- para_fd_set(command_fds[0], &s->rfds, &s->max_fileno);
- if (command_fds[1] >= 0)
- para_fd_set(command_fds[1], &s->rfds, &s->max_fileno);
+ if (exec_fds[0] >= 0)
+ para_fd_set(exec_fds[0], &s->rfds, &s->max_fileno);
+ if (exec_fds[1] >= 0)
+ para_fd_set(exec_fds[1], &s->rfds, &s->max_fileno);
}
-static int command_post_select(struct sched *s, __a_unused struct task *t)
+static int exec_post_select(struct sched *s, struct task *t)
{
+ struct exec_task *ct = container_of(t, struct exec_task, task);
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();
+ enum exec_status es = exec_status();
- if (cmds != CMDS_DCMD)
+ if (es != EXEC_DCMD)
return 0;
for (i = 0; i < 2; i++) {
size_t sz;
- if (command_fds[i] < 0)
+ if (exec_fds[i] < 0)
continue;
- ret = read_nonblock(command_fds[i],
- command_buf[i] + cbo[i],
- 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],
- add_output_line, &i);
- if (sz != cbo[i]) { /* at least one line found */
+ ret = read_nonblock(exec_fds[i],
+ ct->command_buf[i] + ct->cbo[i],
+ COMMAND_BUF_SIZE - 1 - ct->cbo[i], &s->rfds, &sz);
+ ct->cbo[i] += sz;
+ sz = ct->cbo[i];
+ ct->cbo[i] = for_each_line(ct->flags[i], ct->command_buf[i],
+ ct->cbo[i], add_output_line, &i);
+ if (sz != ct->cbo[i]) { /* at least one line found */
wrefresh(bot.win);
- flags[i] = 0;
+ ct->flags[i] = 0;
}
- if (ret < 0 || cmd_pid == 0) {
+ if (ret < 0 || exec_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 */
+ close(exec_fds[i]);
+ exec_fds[i] = -1;
+ ct->flags[i] = 0;
+ ct->cbo[i] = 0;
+ if (exec_fds[!i] < 0) /* both fds closed */
return 1;
}
- if (cbo[i] == COMMAND_BUF_SIZE - 1) {
+ if (ct->cbo[i] == COMMAND_BUF_SIZE - 1) {
PARA_NOTICE_LOG("discarding overlong line");
- cbo[i] = 0;
- flags[i] = FELF_DISCARD_FIRST;
+ ct->cbo[i] = 0;
+ ct->flags[i] = FELF_DISCARD_FIRST;
}
}
return 0;
static void input_pre_select(struct sched *s, __a_unused struct task *t)
{
- enum cmd_status cmds = cmd_status();
-
- if (cmds != CMDS_XCMD)
+ if (exec_status() != EXEC_XCMD)
para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
}
/* read from command pipe and print data to bot window */
-static void exec_and_display_cmd(const char *cmd)
+static void exec_and_display(const char *file_and_args)
{
int ret, fds[3] = {0, 1, 1};
- outputf(COLOR_COMMAND, "%s", cmd);
- ret = para_exec_cmdline_pid(&cmd_pid, cmd, fds);
+ outputf(COLOR_COMMAND, "%s", file_and_args);
+ ret = para_exec_cmdline_pid(&exec_pid, file_and_args, fds);
if (ret < 0)
return;
ret = mark_fd_nonblocking(fds[1]);
ret = mark_fd_nonblocking(fds[2]);
if (ret < 0)
goto fail;
- command_fds[0] = fds[1];
- command_fds[1] = fds[2];
+ exec_fds[0] = fds[1];
+ exec_fds[1] = fds[2];
+ print_in_bar(COLOR_MSG, "hit any key to abort\n");
return;
fail:
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
- close(command_fds[0]);
- close(command_fds[1]);
+ close(exec_fds[0]);
+ close(exec_fds[1]);
}
-static void para_cmd(char *cmd)
+static void exec_para(const char *args)
{
- char *c;
+ char *file_and_args;
- print_in_bar(COLOR_MSG, "executing client command, hit any key to abort\n");
- c = make_message(BINDIR "/para_client -- %s", cmd);
- exec_and_display_cmd(c);
- free(c);
-}
-
-static void display_cmd(char *cmd)
-{
- print_in_bar(COLOR_MSG, "executing display command, hit any key to abort");
- exec_and_display_cmd(cmd);
+ file_and_args = make_message(BINDIR "/para_client -- %s", args);
+ exec_and_display(file_and_args);
+ free(file_and_args);
}
/*
* shutdown curses and stat pipe before executing external commands
*/
-static void external_cmd(char *cmd)
+static void exec_external(char *file_and_args)
{
int fds[3] = {-1, -1, -1};
- if (cmd_pid)
+ if (exec_pid)
return;
shutdown_curses();
- para_exec_cmdline_pid(&cmd_pid, cmd, fds);
+ para_exec_cmdline_pid(&exec_pid, file_and_args, fds);
}
static void handle_command(int c)
continue;
}
if (*handler == 'd')
- display_cmd(arg);
+ exec_and_display(arg);
else if (*handler == 'x')
- external_cmd(arg);
+ exec_external(arg);
else if (*handler == 'p')
- para_cmd(arg);
+ exec_para(arg);
else if (*handler == 'i') {
int num = find_cmd_byname(arg);
if (num >= 0)
static int input_post_select(__a_unused struct sched *s, __a_unused struct task *t)
{
int ret;
- enum cmd_status cmds = cmd_status();
+ enum exec_status exs = exec_status();
- if (cmds == CMDS_XCMD)
+ if (exs == EXEC_XCMD)
return 0;
ret = wgetch(top.win);
if (ret == ERR || ret == KEY_RESIZE)
return 0;
- if (cmds == CMDS_IDLE) {
+ if (exs == EXEC_IDLE) {
handle_command(ret);
return 0;
}
- if (cmd_pid != 0)
- kill(cmd_pid, SIGTERM);
+ if (exec_pid != 0)
+ kill(exec_pid, SIGTERM);
return 0;
}
.tv_usec = (conf.timeout_arg % 1000) * 1000,
},
};
- struct cmd_task cmd_task = {
+ struct exec_task exec_task = {
.task = {
- .status = "cmd",
- .pre_select = command_pre_select,
- .post_select = command_post_select,
+ .status = "exec",
+ .pre_select = exec_pre_select,
+ .post_select = exec_post_select,
},
};
struct status_task status_task = {
.pre_select = status_pre_select,
.post_select = status_post_select,
},
+ .fd = -1
};
struct input_task input_task = {
.task = {
para_install_sighandler(SIGWINCH);
para_install_sighandler(SIGUSR1);
- register_task(&sched, &cmd_task.task);
+ register_task(&sched, &exec_task.task);
register_task(&sched, &status_task.task);
register_task(&sched, &input_task.task);
register_task(&sched, &signal_task.task);
projects / paraslash.git / blobdiff