clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

alloc SHM for all children at startup to ensure all SHM will be reachable from children over the ages

Browse Source
This commit is contained in:
Jérôme Loyet 2011-07-04 22:39:15 +00:00
parent 5c2477a0d8
commit 46ac1e373a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sapi/fpm/fpm/fpm_scoreboard.c
View File

@ -40,7 +40,11 @@ int fpm_scoreboard_init_main() /* {{{ */
} }
wp->scoreboard->nprocs = wp->config->pm_max_children; wp->scoreboard->nprocs = wp->config->pm_max_children;
for (i=0; i<wp->scoreboard->nprocs; i++) { for (i=0; i<wp->scoreboard->nprocs; i++) {
wp->scoreboard->procs[i] = NULL; wp->scoreboard->procs[i] = fpm_shm_alloc(sizeof(struct fpm_scoreboard_proc_s));
if (!wp->scoreboard->procs[i]) {
return -1;
}
memset(wp->scoreboard->procs[i], 0, sizeof(struct fpm_scoreboard_proc_s));
} }
wp->scoreboard->pm = wp->config->pm; wp->scoreboard->pm = wp->config->pm;
@ -242,9 +246,8 @@ void fpm_scoreboard_proc_free(struct fpm_scoreboard_s *scoreboard, int child_ind
return; return;
} }
if (scoreboard->procs[child_index]) { if (scoreboard->procs[child_index] && scoreboard->procs[child_index]->used > 0) {
fpm_shm_free(scoreboard->procs[child_index], sizeof(struct fpm_scoreboard_proc_s)); memset(scoreboard->procs[child_index], 0, sizeof(struct fpm_scoreboard_proc_s));
scoreboard->procs[child_index] = NULL;
} }
/* set this slot as free to avoid search on next alloc */ /* set this slot as free to avoid search on next alloc */
@ -262,7 +265,7 @@ int fpm_scoreboard_proc_alloc(struct fpm_scoreboard_s *scoreboard, int *child_in
/* first try the slot which is supposed to be free */ /* first try the slot which is supposed to be free */
if (scoreboard->free_proc >= 0 && scoreboard->free_proc < scoreboard->nprocs) { if (scoreboard->free_proc >= 0 && scoreboard->free_proc < scoreboard->nprocs) {
if (!scoreboard->procs[scoreboard->free_proc]) { if (scoreboard->procs[scoreboard->free_proc] && !scoreboard->procs[scoreboard->free_proc]->used) {
i = scoreboard->free_proc; i = scoreboard->free_proc;
} }
} }
@ -270,7 +273,7 @@ int fpm_scoreboard_proc_alloc(struct fpm_scoreboard_s *scoreboard, int *child_in
if (i < 0) { /* the supposed free slot is not, let's search for a free slot */ if (i < 0) { /* the supposed free slot is not, let's search for a free slot */
zlog(ZLOG_DEBUG, "[pool %s] the proc->free_slot was not free. Let's search", scoreboard->pool); zlog(ZLOG_DEBUG, "[pool %s] the proc->free_slot was not free. Let's search", scoreboard->pool);
for (i=0; i<scoreboard->nprocs; i++) { for (i=0; i<scoreboard->nprocs; i++) {
if (!scoreboard->procs[i]) { /* found */ if (scoreboard->procs[i] && !scoreboard->procs[i]->used) { /* found */
break; break;
} }
} }
@ -282,10 +285,7 @@ int fpm_scoreboard_proc_alloc(struct fpm_scoreboard_s *scoreboard, int *child_in
return -1; return -1;
} }
scoreboard->procs[i] = fpm_shm_alloc(sizeof(struct fpm_scoreboard_proc_s)); scoreboard->procs[i]->used = 1;
if (!scoreboard->procs[i]) {
return -1;
}
*child_index = i; *child_index = i;
/* supposed next slot is free */ /* supposed next slot is free */

1
sapi/fpm/fpm/fpm_scoreboard.h
View File

@ -22,6 +22,7 @@ struct fpm_scoreboard_proc_s {
atomic_t lock; atomic_t lock;
char dummy[16]; char dummy[16];
}; };
int used;
pid_t pid; pid_t pid;
enum fpm_request_stage_e request_stage; enum fpm_request_stage_e request_stage;
struct timeval accepted; struct timeval accepted;