mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-03 19:51:31 +02:00
Code

Merge branch 'js/maint-daemon-syslog' into maint

Browse Source 
* js/maint-daemon-syslog:
  git daemon: avoid calling syslog() from a signal handler
This commit is contained in:
Junio C Hamano 2008-07-16 15:22:05 -07:00
commit 2de3db2f38
1 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
daemon.c
View File

@ -694,23 +694,47 @@ static void kill_some_children(int signo, unsigned start, unsigned stop)
} }
} }
static void check_dead_children(void)
{
unsigned spawned, reaped, deleted;
spawned = children_spawned;
reaped = children_reaped;
deleted = children_deleted;
while (deleted < reaped) {
pid_t pid = dead_child[deleted % MAX_CHILDREN];
const char *dead = pid < 0 ? " (with error)" : "";
if (pid < 0)
pid = -pid;
/* XXX: Custom logging, since we don't wanna getpid() */
if (verbose) {
if (log_syslog)
syslog(LOG_INFO, "[%d] Disconnected%s",
pid, dead);
else
fprintf(stderr, "[%d] Disconnected%s\n",
pid, dead);
}
remove_child(pid, deleted, spawned);
deleted++;
}
children_deleted = deleted;
}
static void check_max_connections(void) static void check_max_connections(void)
{ {
for (;;) { for (;;) {
int active; int active;
unsigned spawned, reaped, deleted; unsigned spawned, deleted;
check_dead_children();
spawned = children_spawned; spawned = children_spawned;
reaped = children_reaped;
deleted = children_deleted; deleted = children_deleted;
while (deleted < reaped) {
pid_t pid = dead_child[deleted % MAX_CHILDREN];
remove_child(pid, deleted, spawned);
deleted++;
}
children_deleted = deleted;
active = spawned - deleted; active = spawned - deleted;
if (active <= max_connections) if (active <= max_connections)
break; break;
@ -760,18 +784,10 @@ static void child_handler(int signo)
if (pid > 0) { if (pid > 0) {
unsigned reaped = children_reaped; unsigned reaped = children_reaped;
if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
pid = -pid;
dead_child[reaped % MAX_CHILDREN] = pid; dead_child[reaped % MAX_CHILDREN] = pid;
children_reaped = reaped + 1; children_reaped = reaped + 1;
/* XXX: Custom logging, since we don't wanna getpid() */
if (verbose) {
const char *dead = "";
if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
dead = " (with error)";
if (log_syslog)
syslog(LOG_INFO, "[%d] Disconnected%s", pid, dead);
else
fprintf(stderr, "[%d] Disconnected%s\n", pid, dead);
}
continue; continue;
} }
break; break;
@ -928,8 +944,18 @@ static int service_loop(int socknum, int *socklist)
for (;;) { for (;;) {
int i; int i;
int timeout;
if (poll(pfd, socknum, -1) < 0) { /*
* This 1-sec timeout could lead to idly looping but it is
* here so that children culled in child_handler() are reported
* without too much delay. We could probably set up a pipe
* to ourselves that we poll, and write to the fd from child_handler()
* to wake us up (and consume it when the poll() returns...
*/
timeout = (children_spawned != children_deleted) ? 1000 : -1;
i = poll(pfd, socknum, timeout);
if (i < 0) {
if (errno != EINTR) { if (errno != EINTR) {
error("poll failed, resuming: %s", error("poll failed, resuming: %s",
strerror(errno)); strerror(errno));
@ -937,6 +963,10 @@ static int service_loop(int socknum, int *socklist)
} }
continue; continue;
} }
if (i == 0) {
check_dead_children();
continue;
}
for (i = 0; i < socknum; i++) { for (i = 0; i < socknum; i++) {
if (pfd[i].revents & POLLIN) { if (pfd[i].revents & POLLIN) {