From 46ac1e373a1384fee902da79ee11bab386a4f6fd Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Loyet?= <fat@php.net>
Date: Mon, 4 Jul 2011 22:39:15 +0000
Subject: [PATCH] alloc SHM for all children at startup to ensure all SHM will
 be reachable from children over the ages

---
 sapi/fpm/fpm/fpm_scoreboard.c | 20 ++++++++++----------
 sapi/fpm/fpm/fpm_scoreboard.h |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sapi/fpm/fpm/fpm_scoreboard.c b/sapi/fpm/fpm/fpm_scoreboard.c
index a68e13ae8d..120ce453d0 100644
--- a/sapi/fpm/fpm/fpm_scoreboard.c
+++ b/sapi/fpm/fpm/fpm_scoreboard.c
@@ -40,7 +40,11 @@ int fpm_scoreboard_init_main() /* {{{ */
 		}
 		wp->scoreboard->nprocs = wp->config->pm_max_children;
 		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;
@@ -242,9 +246,8 @@ void fpm_scoreboard_proc_free(struct fpm_scoreboard_s *scoreboard, int child_ind
 		return;
 	}
 
-	if (scoreboard->procs[child_index]) {
-		fpm_shm_free(scoreboard->procs[child_index], sizeof(struct fpm_scoreboard_proc_s));
-		scoreboard->procs[child_index] = NULL;
+	if (scoreboard->procs[child_index] && scoreboard->procs[child_index]->used > 0) {
+		memset(scoreboard->procs[child_index], 0, sizeof(struct fpm_scoreboard_proc_s));
 	}
 
 	/* 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 */
 	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;
 		}
 	}
@@ -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 */
 		zlog(ZLOG_DEBUG, "[pool %s] the proc->free_slot was not free. Let's search", scoreboard->pool);
 		for (i=0; i<scoreboard->nprocs; i++) {
-			if (!scoreboard->procs[i]) { /* found */
+			if (scoreboard->procs[i] && !scoreboard->procs[i]->used) { /* found */
 				break;
 			}
 		}
@@ -282,10 +285,7 @@ int fpm_scoreboard_proc_alloc(struct fpm_scoreboard_s *scoreboard, int *child_in
 		return -1;
 	}
 
-	scoreboard->procs[i] = fpm_shm_alloc(sizeof(struct fpm_scoreboard_proc_s));
-	if (!scoreboard->procs[i]) {
-		return -1;
-	}
+	scoreboard->procs[i]->used = 1;
 	*child_index = i;
 
 	/* supposed next slot is free */
diff --git a/sapi/fpm/fpm/fpm_scoreboard.h b/sapi/fpm/fpm/fpm_scoreboard.h
index 00860878cb..e62c42d98c 100644
--- a/sapi/fpm/fpm/fpm_scoreboard.h
+++ b/sapi/fpm/fpm/fpm_scoreboard.h
@@ -22,6 +22,7 @@ struct fpm_scoreboard_proc_s {
 		atomic_t lock;
 		char dummy[16];
 	};
+	int used;
 	pid_t pid;
 	enum fpm_request_stage_e request_stage;
 	struct timeval accepted;
-- 
2.50.1