extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-11-23 08:33:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 349:

Browse Source 
On SIGTERM, just abandon any suspended/locked clients and leave them to it,
otherwise the server will hang around (refusing new connections) until they
exit properly.
This commit is contained in:
Tiago Cunha 2009-09-23 15:10:37 +00:00
parent fea7bda58f
commit 4dd332c95e
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
server.c
View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.192 2009-09-23 15:00:08 tcunha Exp $ */ /* $Id: server.c,v 1.193 2009-09-23 15:10:37 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -48,6 +48,7 @@ void server_create_client(int);
int server_create_socket(void); int server_create_socket(void);
int server_main(int); int server_main(int);
void server_shutdown(void); void server_shutdown(void);
int server_should_shutdown(void);
void server_child_signal(void); void server_child_signal(void);
void server_fill_windows(struct pollfd **); void server_fill_windows(struct pollfd **);
void server_handle_windows(struct pollfd **); void server_handle_windows(struct pollfd **);
@ -247,7 +248,7 @@ server_main(int srv_fd)
struct window *w; struct window *w;
struct pollfd *pfds, *pfd; struct pollfd *pfds, *pfd;
int nfds, xtimeout; int nfds, xtimeout;
u_int i, n; u_int i;
time_t now, last; time_t now, last;
siginit(); siginit();
@ -261,6 +262,10 @@ server_main(int srv_fd)
if (sigterm) if (sigterm)
server_shutdown(); server_shutdown();
/* Stop if no sessions or clients left. */
if (server_should_shutdown())
break;
/* Handle child exit. */ /* Handle child exit. */
if (sigchld) { if (sigchld) {
server_child_signal(); server_child_signal();
@ -340,22 +345,6 @@ server_main(int srv_fd)
/* Collect dead clients and sessions. */ /* Collect dead clients and sessions. */
server_clean_dead(); server_clean_dead();
/*
* If we have no sessions and clients left, let's get out
* of here...
*/
n = 0;
for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
if (ARRAY_ITEM(&sessions, i) != NULL)
n++;
}
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
if (ARRAY_ITEM(&clients, i) != NULL)
n++;
}
if (n == 0)
break;
} }
if (pfds != NULL) if (pfds != NULL)
xfree(pfds); xfree(pfds);
@ -394,6 +383,16 @@ server_shutdown(void)
struct client *c; struct client *c;
u_int i, j; u_int i, j;
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
if (c != NULL) {
if (c->flags & (CLIENT_BAD|CLIENT_SUSPENDED))
server_lost_client(c);
else
server_write_client(c, MSG_SHUTDOWN, NULL, 0);
}
}
for (i = 0; i < ARRAY_LENGTH(&sessions); i++) { for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
s = ARRAY_ITEM(&sessions, i); s = ARRAY_ITEM(&sessions, i);
for (j = 0; j < ARRAY_LENGTH(&clients); j++) { for (j = 0; j < ARRAY_LENGTH(&clients); j++) {
@ -406,16 +405,23 @@ server_shutdown(void)
if (s != NULL) if (s != NULL)
session_destroy(s); session_destroy(s);
} }
}
/* Check if the server should be shutting down (no more clients or windows). */
int
server_should_shutdown(void)
{
u_int i;
for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
if (ARRAY_ITEM(&sessions, i) != NULL)
return (0);
}
for (i = 0; i < ARRAY_LENGTH(&clients); i++) { for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i); if (ARRAY_ITEM(&clients, i) != NULL)
if (c != NULL) { return (0);
if (c->flags & CLIENT_BAD)
server_lost_client(c);
else
server_write_client(c, MSG_SHUTDOWN, NULL, 0);
}
} }
return (1);
} }
/* Handle SIGCHLD. */ /* Handle SIGCHLD. */