fat Mon, 27 Jun 2011 11:33:03 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312523
Log:
- fixed request_timeout and slowlog_timeout from last FPM commit (r312496)
- typo
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_events.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.h
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_events.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_process_ctl.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_request.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_shm.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_shm.h
U php/php-src/trunk/sapi/fpm/fpm/fpm_events.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_request.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_shm.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_shm.h
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_events.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_events.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_events.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -263,6 +263,7 @@
if (!err) {
fpm_pctl_perform_idle_server_maintenance_heartbeat(NULL, 0, NULL);
+ zlog(ZLOG_DEBUG, "%zu bytes have been reserved in SHM", fpm_shm_get_size_allocated());
zlog(ZLOG_NOTICE, "ready to handle connections");
}
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -352,7 +352,7 @@
}
#endif
}
- fpm_scoreboard_update(-1, -1, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard);
+ fpm_scoreboard_update(idle, active, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard);
}
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -32,7 +32,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -67,7 +67,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -101,7 +101,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -145,7 +145,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -171,7 +171,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
proc->request_stage = FPM_REQUEST_FINISHED;
@@ -194,7 +194,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -210,8 +210,9 @@
{
struct fpm_scoreboard_proc_s proc, *proc_p;
- proc_p = fpm_scoreboard_proc_acquire(0, child->scoreboard_i, 1);
+ proc_p = fpm_scoreboard_proc_acquire(child->wp->scoreboard, child->scoreboard_i, 1);
if (!proc_p) {
+ zlog(ZLOG_WARNING, "unable to acquire scoreboard");
return;
}
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -15,6 +15,8 @@
#define MAP_ANONYMOUS MAP_ANON
#endif
+static size_t fpm_shm_size = 0;
+
void *fpm_shm_alloc(size_t size) /* {{{ */
{
void *mem;
@@ -34,6 +36,7 @@
}
memset(mem, size, 0);
+ fpm_shm_size += size;
return mem;
}
/* }}} */
@@ -50,8 +53,18 @@
return 0;
}
+ if (fpm_shm_size - size > 0) {
+ fpm_shm_size -= size;
+ } else {
+ fpm_shm_size = 0;
+ }
return 1;
}
/* }}} */
+size_t fpm_shm_get_size_allocated() /* {{{*/
+{
+ return fpm_shm_size;
+}
+/* }}} */
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.h
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.h 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.h 2011-06-27 11:33:03 UTC (rev 312523)
@@ -7,6 +7,7 @@
void *fpm_shm_alloc(size_t size);
int fpm_shm_free(void *mem, size_t size);
+size_t fpm_shm_get_size_allocated();
#endif
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_events.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_events.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_events.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -263,6 +263,7 @@
if (!err) {
fpm_pctl_perform_idle_server_maintenance_heartbeat(NULL, 0, NULL);
+ zlog(ZLOG_DEBUG, "%zu bytes have been reserved in SHM", fpm_shm_get_size_allocated());
zlog(ZLOG_NOTICE, "ready to handle connections");
}
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_process_ctl.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_process_ctl.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_process_ctl.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -352,7 +352,7 @@
}
#endif
}
- fpm_scoreboard_update(-1, -1, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard);
+ fpm_scoreboard_update(idle, active, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard);
}
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_request.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_request.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_request.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -32,7 +32,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -67,7 +67,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -101,7 +101,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -145,7 +145,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -171,7 +171,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
proc->request_stage = FPM_REQUEST_FINISHED;
@@ -194,7 +194,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -210,8 +210,9 @@
{
struct fpm_scoreboard_proc_s proc, *proc_p;
- proc_p = fpm_scoreboard_proc_acquire(0, child->scoreboard_i, 1);
+ proc_p = fpm_scoreboard_proc_acquire(child->wp->scoreboard, child->scoreboard_i, 1);
if (!proc_p) {
+ zlog(ZLOG_WARNING, "unable to acquire scoreboard");
return;
}
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_shm.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_shm.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_shm.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -15,6 +15,8 @@
#define MAP_ANONYMOUS MAP_ANON
#endif
+static size_t fpm_shm_size = 0;
+
void *fpm_shm_alloc(size_t size) /* {{{ */
{
void *mem;
@@ -34,6 +36,7 @@
}
memset(mem, size, 0);
+ fpm_shm_size += size;
return mem;
}
/* }}} */
@@ -50,8 +53,18 @@
return 0;
}
+ if (fpm_shm_size - size > 0) {
+ fpm_shm_size -= size;
+ } else {
+ fpm_shm_size = 0;
+ }
return 1;
}
/* }}} */
+size_t fpm_shm_get_size_allocated() /* {{{*/
+{
+ return fpm_shm_size;
+}
+/* }}} */
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_shm.h
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_shm.h 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_shm.h 2011-06-27 11:33:03 UTC (rev 312523)
@@ -7,6 +7,7 @@
void *fpm_shm_alloc(size_t size);
int fpm_shm_free(void *mem, size_t size);
+size_t fpm_shm_get_size_allocated();
#endif
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_events.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_events.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_events.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -263,6 +263,7 @@
if (!err) {
fpm_pctl_perform_idle_server_maintenance_heartbeat(NULL, 0, NULL);
+ zlog(ZLOG_DEBUG, "%zu bytes have been reserved in SHM", fpm_shm_get_size_allocated());
zlog(ZLOG_NOTICE, "ready to handle connections");
}
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -352,7 +352,7 @@
}
#endif
}
- fpm_scoreboard_update(-1, -1, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard);
+ fpm_scoreboard_update(idle, active, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard);
}
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_request.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_request.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_request.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -32,7 +32,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -67,7 +67,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -101,7 +101,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -145,7 +145,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -171,7 +171,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
proc->request_stage = FPM_REQUEST_FINISHED;
@@ -194,7 +194,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, "unable to aquire proc scoreboard");
+ zlog(ZLOG_WARNING, "unable to acquire proc scoreboard");
return;
}
@@ -210,8 +210,9 @@
{
struct fpm_scoreboard_proc_s proc, *proc_p;
- proc_p = fpm_scoreboard_proc_acquire(0, child->scoreboard_i, 1);
+ proc_p = fpm_scoreboard_proc_acquire(child->wp->scoreboard, child->scoreboard_i, 1);
if (!proc_p) {
+ zlog(ZLOG_WARNING, "unable to acquire scoreboard");
return;
}
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_shm.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_shm.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_shm.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -15,6 +15,8 @@
#define MAP_ANONYMOUS MAP_ANON
#endif
+static size_t fpm_shm_size = 0;
+
void *fpm_shm_alloc(size_t size) /* {{{ */
{
void *mem;
@@ -34,6 +36,7 @@
}
memset(mem, size, 0);
+ fpm_shm_size += size;
return mem;
}
/* }}} */
@@ -50,8 +53,18 @@
return 0;
}
+ if (fpm_shm_size - size > 0) {
+ fpm_shm_size -= size;
+ } else {
+ fpm_shm_size = 0;
+ }
return 1;
}
/* }}} */
+size_t fpm_shm_get_size_allocated() /* {{{*/
+{
+ return fpm_shm_size;
+}
+/* }}} */
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_shm.h
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_shm.h 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_shm.h 2011-06-27 11:33:03 UTC (rev 312523)
@@ -7,6 +7,7 @@
void *fpm_shm_alloc(size_t size);
int fpm_shm_free(void *mem, size_t size);
+size_t fpm_shm_get_size_allocated();
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
