www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Code Activity

No reason to have a loop writing one byte at a time to the pipe of death

Browse Source 
when the write call will do it for us. Also fix the comments a bit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83562 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Manoj Kasichainula
1999-08-03 20:41:37 +00:00
parent 1ff7ed7b56
commit 07c55ef047
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/mpm/dexter/dexter.c
View File

@@ -1419,11 +1419,9 @@ int ap_mpm_run(pool *_pconf, pool *plog, server_rec *s)
ap_scoreboard_image[i].status = SERVER_DYING;
}
}
/* kill off the idle ones */
for (i = 0; i < num_daemons; ++i) {
if (write(pipe_of_death[1], &char_of_death, 1) == -1) {
ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf, "write pipe_of_death");
}
/* give the children the signal to die */
if (write(pipe_of_death[1], &char_of_death, num_daemons) == -1) {
ap_log_error(APLOG_MARK, APLOG_ERR, server_conf, "write pipe_of_death");
}
}
else {

10
server/mpm/mpmt_pthread/mpmt_pthread.c
View File

@@ -1469,11 +1469,11 @@ int ap_mpm_run(pool *_pconf, pool *plog, server_rec *s)
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, server_conf,
"SIGWINCH received. Doing graceful restart");
/* kill off the idle ones */
for (i = 0; i < ap_daemons_limit; ++i) {
if (write(pipe_of_death[1], &char_of_death, 1) == -1) {
ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf, "write pipe_of_death");
}
/* give the children the signal to die. Sending more bytes than
* children is okay, because the pipe is recreated for every
* generation */
if (write(pipe_of_death[1], &char_of_death, ap_daemons_limit) == -1) {
ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf, "write pipe_of_death");
}
/* This is mostly for debugging... so that we know what is still