- fixed request_timeout and slowlog_timeout from last FPM commit (r312496)

- typo

diff --git a/sapi/fpm/fpm/fpm_events.c b/sapi/fpm/fpm/fpm_events.c
index 7ba982bf75c7f6fe552ba0c68fa44e3b3ddb6f2f..8ae9ad2e20719186192e88177aa770eac01d24f9 100644 (file)
--- a/sapi/fpm/fpm/fpm_events.c
+++ b/sapi/fpm/fpm/fpm_events.c
@@ -263,6 +263,7 @@ void fpm_event_loop(int err) /* {{{ */
        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");
        }
 

diff --git a/sapi/fpm/fpm/fpm_process_ctl.c b/sapi/fpm/fpm/fpm_process_ctl.c
index c297c2d44a69f71f67d3bd0bf9ff4b32010c79ad..0f2685c738fd30ad948996c717386ed48106f72e 100644 (file)
--- a/sapi/fpm/fpm/fpm_process_ctl.c
+++ b/sapi/fpm/fpm/fpm_process_ctl.c
@@ -352,7 +352,7 @@ static void fpm_pctl_perform_idle_server_maintenance(struct timeval *now) /* {{{
                                }
 #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);
                }
 
 

diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c
index 37d161a5c3c0e225f923d1177202421c52c9a76d..e0d1815dbe99b4c9f32d55f73ecf1730bb5f0533 100644 (file)
--- a/sapi/fpm/fpm/fpm_request.c
+++ b/sapi/fpm/fpm/fpm_request.c
@@ -32,7 +32,7 @@ void fpm_request_accepting() /* {{{ */
 
        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 @@ void fpm_request_reading_headers() /* {{{ */
 
        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 @@ void fpm_request_info() /* {{{ */
 
        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 @@ void fpm_request_executing() /* {{{ */
 
        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 @@ void fpm_request_end(TSRMLS_D) /* {{{ */
 
        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 @@ void fpm_request_finished() /* {{{ */
 
        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 @@ void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *now,
 {
        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;
        }
 

diff --git a/sapi/fpm/fpm/fpm_shm.c b/sapi/fpm/fpm/fpm_shm.c
index 8d068d2784ac9cb6c6f184c9f9dcee00bc2a66e8..a777612de0f81385e5eb86eb22a230be0a366e15 100644 (file)
--- a/sapi/fpm/fpm/fpm_shm.c
+++ b/sapi/fpm/fpm/fpm_shm.c
@@ -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 @@ void *fpm_shm_alloc(size_t size) /* {{{ */
        }
 
        memset(mem, size, 0);
+       fpm_shm_size += size;
        return mem;
 }
 /* }}} */
@@ -50,8 +53,18 @@ int fpm_shm_free(void *mem, size_t size) /* {{{ */
                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;
+}
+/* }}} */

diff --git a/sapi/fpm/fpm/fpm_shm.h b/sapi/fpm/fpm/fpm_shm.h
index bcc3d8c1a86a090020892dd2c5814e34223a8905..bcb609981449bc94552531b5b1f4c80768853f71 100644 (file)
--- a/sapi/fpm/fpm/fpm_shm.h
+++ b/sapi/fpm/fpm/fpm_shm.h
@@ -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