diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-02-23 22:25:58 +0000 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-02-23 22:25:58 +0000 |
commit | 3964309c67a683e5132662e38b5ff932af5cbeea (patch) | |
tree | f8566b756787ef7ceeed61e63f61b2a0ece4c751 /cmd-server-info.c | |
parent | 357da035b9d052b4cba8db806c6237272ade6673 (diff) |
Add a command queue to standardize and simplify commands that call other
commands and allow a command to block execution of subsequent commands. This
allows run-shell and if-shell to be synchronous which has been much requested.
Each client has a default command queue and commands are consumed one at a time
from it. A command may suspend execution from the queue by returning
CMD_RETURN_WAIT and then resume it by calling cmd_continue() - for example
run-shell does this from the callback that is fired after the job is freed.
When the command queue becomes empty, command clients are automatically exited
(unless attaching). A callback is also fired - this is used for nested commands
in, for example, if-shell which can block execution of the client's cmdq until
a new cmdq becomes empty.
Also merge all the old error/info/print functions together and lose the old
curclient/cmdclient distinction - a cmdq is bound to one client (or none if in
the configuration file), this is a command client if c->session is NULL
otherwise an attached client.
Diffstat (limited to 'cmd-server-info.c')
-rw-r--r-- | cmd-server-info.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/cmd-server-info.c b/cmd-server-info.c index 933a5395..b044649c 100644 --- a/cmd-server-info.c +++ b/cmd-server-info.c @@ -30,7 +30,7 @@ * Show various information about server. */ -enum cmd_retval cmd_server_info_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_server_info_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_server_info_entry = { "server-info", "info", @@ -43,7 +43,7 @@ const struct cmd_entry cmd_server_info_entry = { }; enum cmd_retval -cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx) +cmd_server_info_exec(unused struct cmd *self, struct cmd_q *cmdq) { struct tty_term *term; struct client *c; @@ -65,48 +65,48 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx) tim = ctime(&start_time); *strchr(tim, '\n') = '\0'; - ctx->print(ctx, + cmdq_print(cmdq, "tmux " VERSION ", pid %ld, started %s", (long) getpid(), tim); - ctx->print( - ctx, "socket path %s, debug level %d", socket_path, debug_level); + cmdq_print(cmdq, "socket path %s, debug level %d", socket_path, + debug_level); if (uname(&un) >= 0) { - ctx->print(ctx, "system is %s %s %s %s", + cmdq_print(cmdq, "system is %s %s %s %s", un.sysname, un.release, un.version, un.machine); } if (cfg_file != NULL) - ctx->print(ctx, "configuration file is %s", cfg_file); + cmdq_print(cmdq, "configuration file is %s", cfg_file); else - ctx->print(ctx, "configuration file not specified"); - ctx->print(ctx, "protocol version is %d", PROTOCOL_VERSION); - ctx->print(ctx, "%s", ""); + cmdq_print(cmdq, "configuration file not specified"); + cmdq_print(cmdq, "protocol version is %d", PROTOCOL_VERSION); + cmdq_print(cmdq, "%s", ""); - ctx->print(ctx, "Clients:"); + cmdq_print(cmdq, "Clients:"); for (i = 0; i < ARRAY_LENGTH(&clients); i++) { c = ARRAY_ITEM(&clients, i); if (c == NULL || c->session == NULL) continue; - ctx->print(ctx,"%2d: %s (%d, %d): %s [%ux%u %s bs=%hho " + cmdq_print(cmdq,"%2d: %s (%d, %d): %s [%ux%u %s bs=%hho " "class=%u] [flags=0x%x/0x%x, references=%u]", i, c->tty.path, c->ibuf.fd, c->tty.fd, c->session->name, c->tty.sx, c->tty.sy, c->tty.termname, c->tty.tio.c_cc[VERASE], c->tty.class, c->flags, c->tty.flags, c->references); } - ctx->print(ctx, "%s", ""); + cmdq_print(cmdq, "%s", ""); - ctx->print(ctx, "Sessions: [%zu]", sizeof (struct grid_cell)); + cmdq_print(cmdq, "Sessions: [%zu]", sizeof (struct grid_cell)); RB_FOREACH(s, sessions, &sessions) { t = s->creation_time.tv_sec; tim = ctime(&t); *strchr(tim, '\n') = '\0'; - ctx->print(ctx, "%2u: %s: %u windows (created %s) [%ux%u] " + cmdq_print(cmdq, "%2u: %s: %u windows (created %s) [%ux%u] " "[flags=0x%x]", s->idx, s->name, winlink_count(&s->windows), tim, s->sx, s->sy, s->flags); RB_FOREACH(wl, winlinks, &s->windows) { w = wl->window; - ctx->print(ctx, "%4u: %s [%ux%u] [flags=0x%x, " + cmdq_print(cmdq, "%4u: %s [%ux%u] [flags=0x%x, " "references=%u, last layout=%d]", wl->idx, w->name, w->sx, w->sy, w->flags, w->references, w->lastlayout); @@ -122,7 +122,7 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx) size += gl->cellsize * sizeof *gl->celldata; } - ctx->print(ctx, + cmdq_print(cmdq, "%6u: %s %lu %d %u/%u, %zu bytes", j, wp->tty, (u_long) wp->pid, wp->fd, lines, gd->hsize + gd->sy, size); @@ -130,43 +130,43 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx) } } } - ctx->print(ctx, "%s", ""); + cmdq_print(cmdq, "%s", ""); - ctx->print(ctx, "Terminals:"); + cmdq_print(cmdq, "Terminals:"); LIST_FOREACH(term, &tty_terms, entry) { - ctx->print(ctx, "%s [references=%u, flags=0x%x]:", + cmdq_print(cmdq, "%s [references=%u, flags=0x%x]:", term->name, term->references, term->flags); for (i = 0; i < NTTYCODE; i++) { ent = &tty_term_codes[i]; code = &term->codes[ent->code]; switch (code->type) { case TTYCODE_NONE: - ctx->print(ctx, "%2u: %s: [missing]", + cmdq_print(cmdq, "%2u: %s: [missing]", ent->code, ent->name); break; case TTYCODE_STRING: strnvis(out, code->value.string, sizeof out, VIS_OCTAL|VIS_TAB|VIS_NL); - ctx->print(ctx, "%2u: %s: (string) %s", + cmdq_print(cmdq, "%2u: %s: (string) %s", ent->code, ent->name, out); break; case TTYCODE_NUMBER: - ctx->print(ctx, "%2u: %s: (number) %d", + cmdq_print(cmdq, "%2u: %s: (number) %d", ent->code, ent->name, code->value.number); break; case TTYCODE_FLAG: - ctx->print(ctx, "%2u: %s: (flag) %s", + cmdq_print(cmdq, "%2u: %s: (flag) %s", ent->code, ent->name, code->value.flag ? "true" : "false"); break; } } } - ctx->print(ctx, "%s", ""); + cmdq_print(cmdq, "%s", ""); - ctx->print(ctx, "Jobs:"); + cmdq_print(cmdq, "Jobs:"); LIST_FOREACH(job, &all_jobs, lentry) { - ctx->print(ctx, "%s [fd=%d, pid=%d, status=%d]", + cmdq_print(cmdq, "%s [fd=%d, pid=%d, status=%d]", job->cmd, job->fd, job->pid, job->status); } |