Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3927
Modified Files:
client.c cmd-pipe-pane.c job.c server.c tmux.c tmux.h window.c
Added Files:
signal.c
Log Message:
Sync OpenBSD patchset 696:
Make signal handler setup/teardown two common functions instead of six,
and reset SIGCHLD after fork to fix problems with some shells. From
Romain Francois.
Index: cmd-pipe-pane.c
===================================================================
RCS file: /cvsroot/tmux/tmux/cmd-pipe-pane.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cmd-pipe-pane.c 4 Dec 2009 22:14:47 -0000 1.10
+++ cmd-pipe-pane.c 14 May 2010 14:30:01 -0000 1.11
@@ -90,7 +90,7 @@
case 0:
/* Child process. */
close(pipe_fd[0]);
- server_signal_clear();
+ clear_signals();
if (dup2(pipe_fd[1], STDIN_FILENO) == -1)
_exit(1);
Index: job.c
===================================================================
RCS file: /cvsroot/tmux/tmux/job.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- job.c 6 Apr 2010 21:59:19 -0000 1.16
+++ job.c 14 May 2010 14:30:01 -0000 1.17
@@ -148,7 +148,7 @@
case -1:
return (-1);
case 0: /* child */
- server_signal_clear();
+ clear_signals();
environ_push(&global_environ);
Index: server.c
===================================================================
RCS file: /cvsroot/tmux/tmux/server.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- server.c 8 Apr 2010 07:54:43 -0000 1.239
+++ server.c 14 May 2010 14:30:01 -0000 1.240
@@ -48,9 +48,6 @@
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);
@@ -143,6 +140,11 @@
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());
@@ -174,7 +176,6 @@
if (setenv("EVENT_NOPOLL", "1", 1) != 0)
fatal("setenv failed");
#endif
- event_init();
#ifdef HAVE_BROKEN_KQUEUE
unsetenv("EVENT_NOKQUEUE");
#endif
@@ -220,7 +221,7 @@
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);
}
@@ -359,61 +360,6 @@
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
--- NEW FILE: signal.c ---
/* $Id: signal.c,v 1.1 2010/05/14 14:30:01 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
* Copyright (c) 2010 Romain Francoise <[email protected]>
*
* 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 <string.h>
#include <signal.h>
#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);
}
Index: client.c
===================================================================
RCS file: /cvsroot/tmux/tmux/client.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- client.c 4 Dec 2009 22:14:47 -0000 1.90
+++ client.c 14 May 2010 14:30:00 -0000 1.91
@@ -176,35 +176,12 @@
__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
Index: window.c
===================================================================
RCS file: /cvsroot/tmux/tmux/window.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- window.c 6 Apr 2010 21:59:19 -0000 1.130
+++ window.c 14 May 2010 14:30:01 -0000 1.131
@@ -527,7 +527,7 @@
environ_push(env);
- server_signal_clear();
+ clear_signals();
log_close();
if (*wp->cmd != '\0') {
Index: tmux.h
===================================================================
RCS file: /cvsroot/tmux/tmux/tmux.h,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -d -r1.555 -r1.556
--- tmux.h 6 Apr 2010 21:59:19 -0000 1.555
+++ tmux.h 14 May 2010 14:30:01 -0000 1.556
@@ -1252,6 +1252,7 @@
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;
@@ -1582,8 +1583,6 @@
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 */
@@ -1899,6 +1898,10 @@
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;
Index: tmux.c
===================================================================
RCS file: /cvsroot/tmux/tmux/tmux.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -d -r1.206 -r1.207
--- tmux.c 14 May 2010 14:18:54 -0000 1.206
+++ tmux.c 14 May 2010 14:30:01 -0000 1.207
@@ -18,6 +18,7 @@
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/wait.h>
#include <errno.h>
#include <event.h>
@@ -40,6 +41,8 @@
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;
@@ -57,11 +60,8 @@
__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 *);
@@ -241,7 +241,6 @@
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;
@@ -541,12 +540,8 @@
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)
@@ -561,7 +556,6 @@
if (setenv("EVENT_NOPOLL", "1", 1) != 0)
fatal("setenv failed");
#endif
- event_init();
#ifdef HAVE_BROKEN_KQUEUE
unsetenv("EVENT_NOKQUEUE");
#endif
@@ -571,8 +565,6 @@
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;
@@ -581,65 +573,23 @@
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;
}
}
@@ -718,7 +668,7 @@
memcpy(&shelldata, imsg.data, sizeof shelldata);
shelldata.shell[(sizeof shelldata.shell) - 1] = '\0';
- main_clear_signals();
+ clear_signals();
shell_exec(shelldata.shell, shellcmd);
default:
------------------------------------------------------------------------------
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
