From c4a2fdf15b5f6cd35319e36636b7daee8061c2ab Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 4 May 2010 17:28:16 +0000 Subject: [PATCH] Put this back in with the initialisation in the right order. --- Makefile | 2 +- client.c | 25 +------------- cmd-pipe-pane.c | 2 +- job.c | 2 +- server.c | 67 ++++--------------------------------- signal.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++ tmux.c | 75 +++++++---------------------------------- tmux.h | 7 ++-- window.c | 2 +- 9 files changed, 116 insertions(+), 154 deletions(-) create mode 100644 signal.c diff --git a/Makefile b/Makefile index a730cbbc..189ea52f 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ SRCS= attributes.c cfg.c client.c clock.c \ layout-set.c layout-string.c layout.c log.c job.c \ mode-key.c names.c options.c paste.c procname.c \ resize.c screen-redraw.c screen-write.c screen.c session.c status.c \ - server-fn.c server.c server-client.c server-window.c \ + signal.c server-fn.c server.c server-client.c server-window.c \ tmux.c tty-keys.c tty-term.c tty.c utf8.c \ window-choose.c window-clock.c window-copy.c window.c \ xterm-keys.c xmalloc.c diff --git a/client.c b/client.c index 69d5bd7b..5940f62e 100644 --- a/client.c +++ b/client.c @@ -172,35 +172,12 @@ client_update_event(void) __dead void client_main(void) { - struct event ev_sigcont, ev_sigterm, ev_sigwinch; - struct sigaction sigact; - logfile("client"); /* Note: event_init() has already been called. */ /* Set up signals. */ - memset(&sigact, 0, sizeof sigact); - sigemptyset(&sigact.sa_mask); - sigact.sa_flags = SA_RESTART; - sigact.sa_handler = SIG_IGN; - if (sigaction(SIGINT, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGPIPE, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGUSR1, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGUSR2, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGTSTP, &sigact, NULL) != 0) - fatal("sigaction failed"); - - signal_set(&ev_sigcont, SIGCONT, client_signal, NULL); - signal_add(&ev_sigcont, NULL); - signal_set(&ev_sigterm, SIGTERM, client_signal, NULL); - signal_add(&ev_sigterm, NULL); - signal_set(&ev_sigwinch, SIGWINCH, client_signal, NULL); - signal_add(&ev_sigwinch, NULL); + set_signals(client_signal); /* * imsg_read in the first client poll loop (before the terminal has diff --git a/cmd-pipe-pane.c b/cmd-pipe-pane.c index efe79a38..0d7c3ff6 100644 --- a/cmd-pipe-pane.c +++ b/cmd-pipe-pane.c @@ -91,7 +91,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx) case 0: /* Child process. */ close(pipe_fd[0]); - server_signal_clear(); + clear_signals(); if (dup2(pipe_fd[1], STDIN_FILENO) == -1) _exit(1); diff --git a/job.c b/job.c index ddeae13f..61aa61fa 100644 --- a/job.c +++ b/job.c @@ -149,7 +149,7 @@ job_run(struct job *job) case -1: return (-1); case 0: /* child */ - server_signal_clear(); + clear_signals(); environ_push(&global_environ); diff --git a/server.c b/server.c index 017cc729..fa5b8919 100644 --- a/server.c +++ b/server.c @@ -49,9 +49,6 @@ struct clients dead_clients; int server_fd; int server_shutdown; struct event server_ev_accept; -struct event server_ev_sigterm; -struct event server_ev_sigusr1; -struct event server_ev_sigchld; struct event server_ev_second; int server_create_socket(void); @@ -141,6 +138,11 @@ server_start(char *path) if (daemon(1, 0) != 0) fatal("daemon failed"); + /* event_init() was called in our parent, need to reinit. */ + if (event_reinit(ev_base) != 0) + fatal("event_reinit failed"); + clear_signals(); + logfile("server"); log_debug("server started, pid %ld", (long) getpid()); @@ -162,8 +164,6 @@ server_start(char *path) log_debug("socket path %s", socket_path); setproctitle("server (%s)", rpathbuf); - event_init(); - server_fd = server_create_socket(); server_client_create(pair[1]); @@ -202,7 +202,7 @@ server_start(char *path) evtimer_set(&server_ev_second, server_second_callback, NULL); evtimer_add(&server_ev_second, &tv); - server_signal_set(); + set_signals(server_signal_callback); server_loop(); exit(0); } @@ -341,61 +341,6 @@ server_accept_callback(int fd, short events, unused void *data) server_client_create(newfd); } -/* Set up server signal handling. */ -void -server_signal_set(void) -{ - struct sigaction sigact; - - memset(&sigact, 0, sizeof sigact); - sigemptyset(&sigact.sa_mask); - sigact.sa_flags = SA_RESTART; - sigact.sa_handler = SIG_IGN; - if (sigaction(SIGINT, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGPIPE, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGUSR2, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGTSTP, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGHUP, &sigact, NULL) != 0) - fatal("sigaction failed"); - - signal_set(&server_ev_sigchld, SIGCHLD, server_signal_callback, NULL); - signal_add(&server_ev_sigchld, NULL); - signal_set(&server_ev_sigterm, SIGTERM, server_signal_callback, NULL); - signal_add(&server_ev_sigterm, NULL); - signal_set(&server_ev_sigusr1, SIGUSR1, server_signal_callback, NULL); - signal_add(&server_ev_sigusr1, NULL); -} - -/* Destroy server signal events. */ -void -server_signal_clear(void) -{ - struct sigaction sigact; - - memset(&sigact, 0, sizeof sigact); - sigemptyset(&sigact.sa_mask); - sigact.sa_flags = SA_RESTART; - sigact.sa_handler = SIG_DFL; - if (sigaction(SIGINT, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGPIPE, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGUSR2, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGTSTP, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGHUP, &sigact, NULL) != 0) - fatal("sigaction failed"); - - signal_del(&server_ev_sigchld); - signal_del(&server_ev_sigterm); - signal_del(&server_ev_sigusr1); -} - /* Signal handler. */ /* ARGSUSED */ void diff --git a/signal.c b/signal.c new file mode 100644 index 00000000..b84d90be --- /dev/null +++ b/signal.c @@ -0,0 +1,88 @@ +/* $Id$ */ + +/* + * Copyright (c) 2007 Nicholas Marriott + * Copyright (c) 2010 Romain Francoise + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include + +#include "tmux.h" + +struct event ev_sigchld; +struct event ev_sigcont; +struct event ev_sigterm; +struct event ev_sigusr1; +struct event ev_sigwinch; + +void +set_signals(void(*handler)(int, short, unused void *)) +{ + struct sigaction sigact; + + memset(&sigact, 0, sizeof sigact); + sigemptyset(&sigact.sa_mask); + sigact.sa_flags = SA_RESTART; + sigact.sa_handler = SIG_IGN; + if (sigaction(SIGINT, &sigact, NULL) != 0) + fatal("sigaction failed"); + if (sigaction(SIGPIPE, &sigact, NULL) != 0) + fatal("sigaction failed"); + if (sigaction(SIGUSR2, &sigact, NULL) != 0) + fatal("sigaction failed"); + if (sigaction(SIGTSTP, &sigact, NULL) != 0) + fatal("sigaction failed"); + if (sigaction(SIGHUP, &sigact, NULL) != 0) + fatal("sigaction failed"); + + signal_set(&ev_sigchld, SIGCHLD, handler, NULL); + signal_add(&ev_sigchld, NULL); + signal_set(&ev_sigcont, SIGCONT, handler, NULL); + signal_add(&ev_sigcont, NULL); + signal_set(&ev_sigterm, SIGTERM, handler, NULL); + signal_add(&ev_sigterm, NULL); + signal_set(&ev_sigusr1, SIGUSR1, handler, NULL); + signal_add(&ev_sigusr1, NULL); + signal_set(&ev_sigwinch, SIGWINCH, handler, NULL); + signal_add(&ev_sigwinch, NULL); +} + +void +clear_signals(void) +{ + struct sigaction sigact; + + memset(&sigact, 0, sizeof sigact); + sigemptyset(&sigact.sa_mask); + sigact.sa_flags = SA_RESTART; + sigact.sa_handler = SIG_DFL; + if (sigaction(SIGINT, &sigact, NULL) != 0) + fatal("sigaction failed"); + if (sigaction(SIGPIPE, &sigact, NULL) != 0) + fatal("sigaction failed"); + if (sigaction(SIGUSR2, &sigact, NULL) != 0) + fatal("sigaction failed"); + if (sigaction(SIGTSTP, &sigact, NULL) != 0) + fatal("sigaction failed"); + if (sigaction(SIGHUP, &sigact, NULL) != 0) + fatal("sigaction failed"); + + event_del(&ev_sigchld); + event_del(&ev_sigcont); + event_del(&ev_sigterm); + event_del(&ev_sigusr1); + event_del(&ev_sigwinch); +} diff --git a/tmux.c b/tmux.c index 741ee38e..2b0dd63c 100644 --- a/tmux.c +++ b/tmux.c @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -41,6 +42,8 @@ struct options global_s_options; /* session options */ struct options global_w_options; /* window options */ struct environ global_environ; +struct event_base *ev_base; + int debug_level; time_t start_time; char *socket_path; @@ -58,11 +61,8 @@ char *makesockpath(const char *); __dead void shell_exec(const char *, const char *); struct imsgbuf *main_ibuf; -struct event main_ev_sigterm; int main_exitval; -void main_set_signals(void); -void main_clear_signals(void); void main_signal(int, short, unused void *); void main_callback(int, short, void *); void main_dispatch(const char *); @@ -238,7 +238,6 @@ main(int argc, char **argv) struct keylist *keylist; struct env_data envdata; struct msg_command_data cmddata; - struct sigaction sigact; char *s, *shellcmd, *path, *label, *home, *cause; char cwd[MAXPATHLEN], **var; void *buf; @@ -538,24 +537,16 @@ main(int argc, char **argv) exit(1); } - /* Catch SIGCHLD to avoid a zombie when starting the server. */ - memset(&sigact, 0, sizeof sigact); - sigemptyset(&sigact.sa_mask); - sigact.sa_handler = SIG_IGN; - if (sigaction(SIGCHLD, &sigact, NULL) != 0) - fatal("sigaction failed"); + ev_base = event_init(); + set_signals(main_signal); /* Initialise the client socket/start the server. */ if ((main_ibuf = client_init(path, cmdflags, flags)) == NULL) exit(1); xfree(path); - event_init(); - imsg_compose(main_ibuf, msg, PROTOCOL_VERSION, -1, -1, buf, len); - main_set_signals(); - events = EV_READ; if (main_ibuf->w.queued > 0) events |= EV_WRITE; @@ -564,65 +555,23 @@ main(int argc, char **argv) main_exitval = 0; event_dispatch(); - main_clear_signals(); + clear_signals(); client_main(); /* doesn't return */ } -void -main_set_signals(void) -{ - struct sigaction sigact; - - memset(&sigact, 0, sizeof sigact); - sigemptyset(&sigact.sa_mask); - sigact.sa_flags = SA_RESTART; - sigact.sa_handler = SIG_IGN; - if (sigaction(SIGINT, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGPIPE, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGUSR1, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGUSR2, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGTSTP, &sigact, NULL) != 0) - fatal("sigaction failed"); - - signal_set(&main_ev_sigterm, SIGTERM, main_signal, NULL); - signal_add(&main_ev_sigterm, NULL); -} - -void -main_clear_signals(void) -{ - struct sigaction sigact; - - memset(&sigact, 0, sizeof sigact); - sigemptyset(&sigact.sa_mask); - sigact.sa_flags = SA_RESTART; - sigact.sa_handler = SIG_DFL; - if (sigaction(SIGINT, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGPIPE, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGUSR1, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGUSR2, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGTSTP, &sigact, NULL) != 0) - fatal("sigaction failed"); - - event_del(&main_ev_sigterm); -} - /* ARGSUSED */ void main_signal(int sig, unused short events, unused void *data) { + int status; + switch (sig) { case SIGTERM: exit(1); + case SIGCHLD: + waitpid(WAIT_ANY, &status, WNOHANG); + break; } } @@ -701,7 +650,7 @@ main_dispatch(const char *shellcmd) memcpy(&shelldata, imsg.data, sizeof shelldata); shelldata.shell[(sizeof shelldata.shell) - 1] = '\0'; - main_clear_signals(); + clear_signals(); shell_exec(shelldata.shell, shellcmd); default: diff --git a/tmux.h b/tmux.h index 80a6a9a7..ec6ab3d4 100644 --- a/tmux.h +++ b/tmux.h @@ -1253,6 +1253,7 @@ extern struct options global_options; extern struct options global_s_options; extern struct options global_w_options; extern struct environ global_environ; +extern struct event_base *ev_base; extern char *cfg_file; extern int debug_level; extern int be_quiet; @@ -1583,8 +1584,6 @@ const char *key_string_lookup_key(int); extern struct clients clients; extern struct clients dead_clients; int server_start(char *); -void server_signal_set(void); -void server_signal_clear(void); void server_update_socket(void); /* server-client.c */ @@ -1900,6 +1899,10 @@ void window_choose_ready(struct window_pane *, void queue_window_name(struct window *); char *default_window_name(struct window *); +/* signal.c */ +void set_signals(void(*handler)(int, short, unused void *)); +void clear_signals(void); + /* session.c */ extern struct sessions sessions; extern struct sessions dead_sessions; diff --git a/window.c b/window.c index 00c03f6e..0811a4cb 100644 --- a/window.c +++ b/window.c @@ -529,7 +529,7 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell, environ_push(env); - server_signal_clear(); + clear_signals(); log_close(); if (*wp->cmd != '\0') {