VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-01 16:41:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

mod_slotmem_shm: better comment on MPM WinNT specifics.

Browse Source 
Also avoids registering a no-op cleanup for WinNT children.

No functional changes.

[Reverted by r1831868]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1826970 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2018-03-16 11:10:35 +00:00
parent 9deb01664f
commit a78ffd288b
1 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
modules/slotmem/mod_slotmem_shm.c
View File

@ -292,17 +292,11 @@ static apr_status_t cleanup_slotmem(void *is_startup)
int is_exiting = (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_EXITING); int is_exiting = (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_EXITING);
ap_slotmem_instance_t *mem; ap_slotmem_instance_t *mem;
if (is_child_process()) { /* When restarting or stopping we want to flush persisted data, and in the
/* No reuse/retained data from here, let pconf cleanup everything */ * stopping case we also want to unlink the SHMs. On the first (dry-)load
*retained_globallistmem = globallistmem = NULL; * though (is_startup != NULL), the retained list is not used yet and SHMs
return APR_SUCCESS; * contents were untouched (so they don't need to be persisted); unlink
} * everything before the real loading (from scratch).
/* When in startup/pre-config's cleanup, the retained data and global pool
* are not used yet, but the SHMs contents were untouched hence they don't
* need to be persisted, simply unlink them.
* Otherwise when restarting or stopping we want to flush persisted data,
* and in the stopping/exiting case we also want to unlink the SHMs.
*/ */
for (mem = globallistmem; mem; mem = mem->next) { for (mem = globallistmem; mem; mem = mem->next) {
int unlink; int unlink;
@ -324,13 +318,12 @@ static apr_status_t cleanup_slotmem(void *is_startup)
} }
} }
if (is_exiting) { if (is_startup || is_exiting) {
*retained_globallistmem = NULL; *retained_globallistmem = NULL;
} }
else if (!is_startup) { else {
*retained_globallistmem = globallistmem; *retained_globallistmem = globallistmem;
} }
globallistmem = NULL;
return APR_SUCCESS; return APR_SUCCESS;
} }
@ -458,9 +451,9 @@ static apr_status_t slotmem_create(ap_slotmem_instance_t **new,
{ {
if (fbased) { if (fbased) {
/* For MPMs (e.g. winnt) that run pre/post_config() phases in /* For MPMs that run pre/post_config() phases in both the parent
* both the parent and children processes, SHMs created by the * and children processes (e.g. winnt), SHMs created by the
* parent exist in the children already; only attach them. * parent exist in the children already; attach them.
*/ */
if (is_child_process()) { if (is_child_process()) {
rv = apr_shm_attach(&shm, fname, gpool); rv = apr_shm_attach(&shm, fname, gpool);
@ -839,25 +832,31 @@ static int pre_config(apr_pool_t *pconf, apr_pool_t *plog,
} }
globallistmem = *retained_globallistmem; globallistmem = *retained_globallistmem;
/* For the first (dry-)loading or children in MPMs which (re-)run if (!is_child_process()) {
* pre_config we don't need to retain slotmems, so use pconf and its /* For the first (dry-)load, create SHMs on pconf and let them be
* normal cleanups. Otherwise we use ap_pglobal to match the lifetime * cleaned up before the real loading. Otherwise SHMs shall have the
* of retained data and register our own cleanup to update them. * same lifetime as the retained list (ap_pglobal). The cleanup is to
*/ * update the retained list on restart, or to unlink the SHMs on stop
if (is_child_process()) { * or after the first (dry-)load (is_startup != NULL).
gpool = pconf; */
} if (ap_state_query(AP_SQ_MAIN_STATE) != AP_SQ_MS_CREATE_PRE_CONFIG) {
else if (ap_state_query(AP_SQ_MAIN_STATE) != AP_SQ_MS_CREATE_PRE_CONFIG) { gpool = ap_pglobal;
gpool = ap_pglobal; }
else {
is_startup = (void *)1;
gpool = pconf;
}
apr_pool_cleanup_register(pconf, is_startup, cleanup_slotmem,
apr_pool_cleanup_null);
} }
else { else {
is_startup = (void *)1; /* For MPMs which (re-)run pre_config we don't need to retain slotmems
* in children, so use pconf and let it detach SHMs when children exit.
*/
gpool = pconf; gpool = pconf;
} }
apr_pool_cleanup_register(pconf, is_startup, cleanup_slotmem,
apr_pool_cleanup_null);
return OK; return OK;
} }