www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-07-30 20:03:10 +03:00
Code Activity

the mpm-note-child-killed hook was just for use by

Browse Source 
ap_{reclaim,relieve}_child_processes; those functions can
invoke the hook directly; the function ap_mpm_note_child_killed()
is useless


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086953 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeff Trawick
2011-03-30 13:42:00 +00:00
parent 573a235d3b
commit b1e1cff7f9
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/manual/developer/new_api_2_4.xml
View File

@ -222,7 +222,7 @@
<li>REMOVES: accept, lockfile, lock_mech, set_scoreboard (locking uses the new ap_mutex API)</li>
<li>NEW API to drop privileges (delegates this platform-dependent
function to modules)</li>
<li>NEW Hooks: mpm_query, mpm_note_child_killed, timed_callback, get_name, and function ap_mpm_note_child_killed</li>
<li>NEW Hooks: mpm_query, mpm_note_child_killed, timed_callback, and get_name</li>
</ul>
</section>

8
include/mpm_common.h
View File

@ -321,8 +321,6 @@ extern const char *ap_mpm_set_exception_hook(cmd_parms *cmd, void *dummy,
const char *arg);
#endif
AP_DECLARE(apr_status_t) ap_mpm_note_child_killed(int childnum);
AP_DECLARE_HOOK(int,monitor,(apr_pool_t *p, server_rec *s))
/* register modules that undertake to manage system security */
@ -335,7 +333,11 @@ AP_DECLARE_HOOK(int, drop_privileges, (apr_pool_t * pchild, server_rec * s))
*/
AP_DECLARE_HOOK(int, mpm_query, (int query_code, int *result, apr_status_t *rv))
/* child specified by index has been killed */
/* child specified by index has been killed; MPMs which use
* ap_reclaim_child_processes() or ap_relieve_child_processes() must
* implement this in order to update the scoreboard and handle any
* MPM-specific actions
*/
AP_DECLARE_HOOK(apr_status_t, mpm_note_child_killed, (int childnum))
/* register the specified callback */

5
server/mpm_common.c
View File

@ -373,11 +373,6 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result)
return rv;
}
AP_DECLARE(apr_status_t) ap_mpm_note_child_killed(int childnum)
{
return ap_run_mpm_note_child_killed(childnum);
}
AP_DECLARE(apr_status_t) ap_mpm_register_timed_callback(apr_time_t t, ap_mpm_callback_fn_t *cbfn, void *baton)
{
return ap_run_mpm_register_timed_callback(t, cbfn, baton);

4
server/mpm_unix.c
View File

@ -228,7 +228,7 @@ void ap_reclaim_child_processes(int terminate)
}
if (reclaim_one_pid(pid, action_table[cur_action].action)) {
ap_mpm_note_child_killed(i);
ap_run_mpm_note_child_killed(i);
}
else {
++not_dead_yet;
@ -273,7 +273,7 @@ void ap_relieve_child_processes(void)
}
if (reclaim_one_pid(pid, DO_NOTHING)) {
ap_mpm_note_child_killed(i);
ap_run_mpm_note_child_killed(i);
}
}