Adjust bogus checks in FPM as HAVE_FPM_LQ is always defined

Drop checks for FPM status as per review

Closes GH-5530

diff --git a/sapi/fpm/fpm/fpm_scoreboard.c b/sapi/fpm/fpm/fpm_scoreboard.c
index 328f999f0c9b0326341773c6b8df2c64bad6c440..f1ce48a96f5b3cbc8e1ef34078aeb6cbd52f0d65 100644 (file)
--- a/sapi/fpm/fpm/fpm_scoreboard.c
+++ b/sapi/fpm/fpm/fpm_scoreboard.c
@@ -101,7 +101,7 @@ void fpm_scoreboard_update(int idle, int active, int lq, int lq_len, int request
                if (lq_len >= 0) {
                        scoreboard->lq_len = lq_len;
                }
-#ifdef HAVE_FPM_LQ /* prevent unnecessary test */
+#if HAVE_FPM_LQ /* prevent unnecessary test */
                if (scoreboard->lq > scoreboard->lq_max) {
                        scoreboard->lq_max = scoreboard->lq;
                }

diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c
index 2e4fff937a82a18c27d313eb0fa7cdb394a2ad8c..6b8f7785a42834c18c8e204dbd46fa7dcd01a913 100644 (file)
--- a/sapi/fpm/fpm/fpm_status.c
+++ b/sapi/fpm/fpm/fpm_status.c
@@ -53,7 +53,6 @@ int fpm_status_export_to_zval(zval *status)
        double cpu;
        int i;
 
-
        scoreboard_p = fpm_scoreboard_acquire(NULL, 1);
        if (!scoreboard_p) {
                zlog(ZLOG_NOTICE, "[pool %s] status: scoreboard already in use.", scoreboard_p->pool);
@@ -85,11 +84,9 @@ int fpm_status_export_to_zval(zval *status)
        add_assoc_long(status, "start-time", scoreboard.start_epoch);
        add_assoc_long(status, "start-since", now_epoch - scoreboard.start_epoch);
        add_assoc_long(status, "accepted-conn", scoreboard.requests);
-#ifdef HAVE_FPM_LQ
        add_assoc_long(status, "listen-queue", scoreboard.lq);
        add_assoc_long(status, "max-listen-queue", scoreboard.lq_max);
        add_assoc_long(status, "listen-queue-len", scoreboard.lq_len);
-#endif
        add_assoc_long(status, "idle-processes", scoreboard.idle);
        add_assoc_long(status, "active-processes", scoreboard.active);
        add_assoc_long(status, "total-processes", scoreboard.idle + scoreboard.active);
@@ -103,14 +100,12 @@ int fpm_status_export_to_zval(zval *status)
                        continue;
                }
                proc_p = &procs[i];
-#ifdef HAVE_FPM_LQ
                /* prevent NaN */
                if (procs[i].cpu_duration.tv_sec == 0 && procs[i].cpu_duration.tv_usec == 0) {
                        cpu = 0.;
                } else {
                        cpu = (procs[i].last_request_cpu.tms_utime + procs[i].last_request_cpu.tms_stime + procs[i].last_request_cpu.tms_cutime + procs[i].last_request_cpu.tms_cstime) / fpm_scoreboard_get_tick() / (procs[i].cpu_duration.tv_sec + procs[i].cpu_duration.tv_usec / 1000000.) * 100.;
                }
-#endif
 
                array_init(&fpm_proc_stat);
                add_assoc_long(&fpm_proc_stat, "pid", procs[i].pid);
@@ -130,9 +125,7 @@ int fpm_status_export_to_zval(zval *status)
                add_assoc_long(&fpm_proc_stat, "request-length", procs[i].content_length);
                add_assoc_string(&fpm_proc_stat, "user", procs[i].auth_user[0] != '\0' ? procs[i].auth_user : "-");
                add_assoc_string(&fpm_proc_stat, "script", procs[i].script_filename[0] != '\0' ? procs[i].script_filename : "-");
-#ifdef HAVE_FPM_LQ
                add_assoc_double(&fpm_proc_stat, "last-request-cpu", procs[i].request_stage == FPM_REQUEST_ACCEPTING ? cpu : 0.);
-#endif
                add_assoc_long(&fpm_proc_stat, "last-request-memory", procs[i].request_stage == FPM_REQUEST_ACCEPTING ? procs[i].memory : 0);
                add_next_index_zval(&fpm_proc_stats, &fpm_proc_stat);
        }
@@ -245,11 +238,9 @@ int fpm_status_handle_request(void) /* {{{ */
                                        "<tr><th>start time</th><td>%s</td></tr>\n"
                                        "<tr><th>start since</th><td>%lu</td></tr>\n"
                                        "<tr><th>accepted conn</th><td>%lu</td></tr>\n"
-#ifdef HAVE_FPM_LQ
                                        "<tr><th>listen queue</th><td>%d</td></tr>\n"
                                        "<tr><th>max listen queue</th><td>%d</td></tr>\n"
                                        "<tr><th>listen queue len</th><td>%u</td></tr>\n"
-#endif
                                        "<tr><th>idle processes</th><td>%d</td></tr>\n"
                                        "<tr><th>active processes</th><td>%d</td></tr>\n"
                                        "<tr><th>total processes</th><td>%d</td></tr>\n"
@@ -275,9 +266,7 @@ int fpm_status_handle_request(void) /* {{{ */
                                                "<th>content length</th>"
                                                "<th>user</th>"
                                                "<th>script</th>"
-#ifdef HAVE_FPM_LQ
                                                "<th>last request cpu</th>"
-#endif
                                                "<th>last request memory</th>"
                                        "</tr>\n";
 
@@ -294,9 +283,7 @@ int fpm_status_handle_request(void) /* {{{ */
                                                "<td>%zu</td>"
                                                "<td>%s</td>"
                                                "<td>%s</td>"
-#ifdef HAVE_FPM_LQ
                                                "<td>%.2f</td>"
-#endif
                                                "<td>%zu</td>"
                                        "</tr>\n";
 
@@ -317,11 +304,9 @@ int fpm_status_handle_request(void) /* {{{ */
                                "<start-time>%s</start-time>\n"
                                "<start-since>%lu</start-since>\n"
                                "<accepted-conn>%lu</accepted-conn>\n"
-#ifdef HAVE_FPM_LQ
                                "<listen-queue>%d</listen-queue>\n"
                                "<max-listen-queue>%d</max-listen-queue>\n"
                                "<listen-queue-len>%u</listen-queue-len>\n"
-#endif
                                "<idle-processes>%d</idle-processes>\n"
                                "<active-processes>%d</active-processes>\n"
                                "<total-processes>%d</total-processes>\n"
@@ -346,9 +331,7 @@ int fpm_status_handle_request(void) /* {{{ */
                                                        "<content-length>%zu</content-length>"
                                                        "<user>%s</user>"
                                                        "<script>%s</script>"
-#ifdef HAVE_FPM_LQ
                                                        "<last-request-cpu>%.2f</last-request-cpu>"
-#endif
                                                        "<last-request-memory>%zu</last-request-memory>"
                                                "</process>\n"
                                        ;
@@ -367,11 +350,9 @@ int fpm_status_handle_request(void) /* {{{ */
                                "\"start time\":%s,"
                                "\"start since\":%lu,"
                                "\"accepted conn\":%lu,"
-#ifdef HAVE_FPM_LQ
                                "\"listen queue\":%d,"
                                "\"max listen queue\":%d,"
                                "\"listen queue len\":%u,"
-#endif
                                "\"idle processes\":%d,"
                                "\"active processes\":%d,"
                                "\"total processes\":%d,"
@@ -397,9 +378,7 @@ int fpm_status_handle_request(void) /* {{{ */
                                        "\"content length\":%zu,"
                                        "\"user\":\"%s\","
                                        "\"script\":\"%s\","
-#ifdef HAVE_FPM_LQ
                                        "\"last request cpu\":%.2f,"
-#endif
                                        "\"last request memory\":%zu"
                                        "}";
 
@@ -417,11 +396,9 @@ int fpm_status_handle_request(void) /* {{{ */
                                "start time:           %s\n"
                                "start since:          %lu\n"
                                "accepted conn:        %lu\n"
-#ifdef HAVE_FPM_LQ
                                "listen queue:         %d\n"
                                "max listen queue:     %d\n"
                                "listen queue len:     %u\n"
-#endif
                                "idle processes:       %d\n"
                                "active processes:     %d\n"
                                "total processes:      %d\n"
@@ -444,9 +421,7 @@ int fpm_status_handle_request(void) /* {{{ */
                                                "content length:       %zu\n"
                                                "user:                 %s\n"
                                                "script:               %s\n"
-#ifdef HAVE_FPM_LQ
                                                "last request cpu:     %.2f\n"
-#endif
                                                "last request memory:  %zu\n";
                                }
                }
@@ -459,11 +434,9 @@ int fpm_status_handle_request(void) /* {{{ */
                                time_buffer,
                                (unsigned long) (now_epoch - scoreboard.start_epoch),
                                scoreboard.requests,
-#ifdef HAVE_FPM_LQ
                                scoreboard.lq,
                                scoreboard.lq_max,
                                scoreboard.lq_len,
-#endif
                                scoreboard.idle,
                                scoreboard.active,
                                scoreboard.idle + scoreboard.active,
@@ -486,9 +459,7 @@ int fpm_status_handle_request(void) /* {{{ */
                        zend_string *tmp_query_string;
                        char *query_string;
                        struct timeval duration, now;
-#ifdef HAVE_FPM_LQ
                        float cpu;
-#endif
 
                        fpm_clock_get(&now);
 
@@ -522,14 +493,12 @@ int fpm_status_handle_request(void) /* {{{ */
                                        }
                                }
 
-#ifdef HAVE_FPM_LQ
                                /* prevent NaN */
                                if (proc.cpu_duration.tv_sec == 0 && proc.cpu_duration.tv_usec == 0) {
                                        cpu = 0.;
                                } else {
                                        cpu = (proc.last_request_cpu.tms_utime + proc.last_request_cpu.tms_stime + proc.last_request_cpu.tms_cutime + proc.last_request_cpu.tms_cstime) / fpm_scoreboard_get_tick() / (proc.cpu_duration.tv_sec + proc.cpu_duration.tv_usec / 1000000.) * 100.;
                                }
-#endif
 
                                if (proc.request_stage == FPM_REQUEST_ACCEPTING) {
                                        duration = proc.duration;
@@ -551,9 +520,7 @@ int fpm_status_handle_request(void) /* {{{ */
                                        proc.content_length,
                                        proc.auth_user[0] != '\0' ? proc.auth_user : "-",
                                        proc.script_filename[0] != '\0' ? proc.script_filename : "-",
-#ifdef HAVE_FPM_LQ
                                        proc.request_stage == FPM_REQUEST_ACCEPTING ? cpu : 0.,
-#endif
                                        proc.request_stage == FPM_REQUEST_ACCEPTING ? proc.memory : 0);
                                PUTS(buffer);
                                efree(buffer);