Skip to content

Commit f717ec6

Browse files
committed
Adjust bogus checks in FPM as HAVE_FPM_LQ is always defined
Drop checks for FPM status as per review Closes GH-5530
1 parent 35e0a91 commit f717ec6

File tree

2 files changed

+1
-34
lines changed

2 files changed

+1
-34
lines changed

sapi/fpm/fpm/fpm_scoreboard.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void fpm_scoreboard_update(int idle, int active, int lq, int lq_len, int request
101101
if (lq_len >= 0) {
102102
scoreboard->lq_len = lq_len;
103103
}
104-
#ifdef HAVE_FPM_LQ /* prevent unnecessary test */
104+
#if HAVE_FPM_LQ /* prevent unnecessary test */
105105
if (scoreboard->lq > scoreboard->lq_max) {
106106
scoreboard->lq_max = scoreboard->lq;
107107
}

sapi/fpm/fpm/fpm_status.c

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ int fpm_status_export_to_zval(zval *status)
5353
double cpu;
5454
int i;
5555

56-
5756
scoreboard_p = fpm_scoreboard_acquire(NULL, 1);
5857
if (!scoreboard_p) {
5958
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)
8584
add_assoc_long(status, "start-time", scoreboard.start_epoch);
8685
add_assoc_long(status, "start-since", now_epoch - scoreboard.start_epoch);
8786
add_assoc_long(status, "accepted-conn", scoreboard.requests);
88-
#ifdef HAVE_FPM_LQ
8987
add_assoc_long(status, "listen-queue", scoreboard.lq);
9088
add_assoc_long(status, "max-listen-queue", scoreboard.lq_max);
9189
add_assoc_long(status, "listen-queue-len", scoreboard.lq_len);
92-
#endif
9390
add_assoc_long(status, "idle-processes", scoreboard.idle);
9491
add_assoc_long(status, "active-processes", scoreboard.active);
9592
add_assoc_long(status, "total-processes", scoreboard.idle + scoreboard.active);
@@ -103,14 +100,12 @@ int fpm_status_export_to_zval(zval *status)
103100
continue;
104101
}
105102
proc_p = &procs[i];
106-
#ifdef HAVE_FPM_LQ
107103
/* prevent NaN */
108104
if (procs[i].cpu_duration.tv_sec == 0 && procs[i].cpu_duration.tv_usec == 0) {
109105
cpu = 0.;
110106
} else {
111107
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.;
112108
}
113-
#endif
114109

115110
array_init(&fpm_proc_stat);
116111
add_assoc_long(&fpm_proc_stat, "pid", procs[i].pid);
@@ -130,9 +125,7 @@ int fpm_status_export_to_zval(zval *status)
130125
add_assoc_long(&fpm_proc_stat, "request-length", procs[i].content_length);
131126
add_assoc_string(&fpm_proc_stat, "user", procs[i].auth_user[0] != '\0' ? procs[i].auth_user : "-");
132127
add_assoc_string(&fpm_proc_stat, "script", procs[i].script_filename[0] != '\0' ? procs[i].script_filename : "-");
133-
#ifdef HAVE_FPM_LQ
134128
add_assoc_double(&fpm_proc_stat, "last-request-cpu", procs[i].request_stage == FPM_REQUEST_ACCEPTING ? cpu : 0.);
135-
#endif
136129
add_assoc_long(&fpm_proc_stat, "last-request-memory", procs[i].request_stage == FPM_REQUEST_ACCEPTING ? procs[i].memory : 0);
137130
add_next_index_zval(&fpm_proc_stats, &fpm_proc_stat);
138131
}
@@ -245,11 +238,9 @@ int fpm_status_handle_request(void) /* {{{ */
245238
"<tr><th>start time</th><td>%s</td></tr>\n"
246239
"<tr><th>start since</th><td>%lu</td></tr>\n"
247240
"<tr><th>accepted conn</th><td>%lu</td></tr>\n"
248-
#ifdef HAVE_FPM_LQ
249241
"<tr><th>listen queue</th><td>%d</td></tr>\n"
250242
"<tr><th>max listen queue</th><td>%d</td></tr>\n"
251243
"<tr><th>listen queue len</th><td>%u</td></tr>\n"
252-
#endif
253244
"<tr><th>idle processes</th><td>%d</td></tr>\n"
254245
"<tr><th>active processes</th><td>%d</td></tr>\n"
255246
"<tr><th>total processes</th><td>%d</td></tr>\n"
@@ -275,9 +266,7 @@ int fpm_status_handle_request(void) /* {{{ */
275266
"<th>content length</th>"
276267
"<th>user</th>"
277268
"<th>script</th>"
278-
#ifdef HAVE_FPM_LQ
279269
"<th>last request cpu</th>"
280-
#endif
281270
"<th>last request memory</th>"
282271
"</tr>\n";
283272

@@ -294,9 +283,7 @@ int fpm_status_handle_request(void) /* {{{ */
294283
"<td>%zu</td>"
295284
"<td>%s</td>"
296285
"<td>%s</td>"
297-
#ifdef HAVE_FPM_LQ
298286
"<td>%.2f</td>"
299-
#endif
300287
"<td>%zu</td>"
301288
"</tr>\n";
302289

@@ -317,11 +304,9 @@ int fpm_status_handle_request(void) /* {{{ */
317304
"<start-time>%s</start-time>\n"
318305
"<start-since>%lu</start-since>\n"
319306
"<accepted-conn>%lu</accepted-conn>\n"
320-
#ifdef HAVE_FPM_LQ
321307
"<listen-queue>%d</listen-queue>\n"
322308
"<max-listen-queue>%d</max-listen-queue>\n"
323309
"<listen-queue-len>%u</listen-queue-len>\n"
324-
#endif
325310
"<idle-processes>%d</idle-processes>\n"
326311
"<active-processes>%d</active-processes>\n"
327312
"<total-processes>%d</total-processes>\n"
@@ -346,9 +331,7 @@ int fpm_status_handle_request(void) /* {{{ */
346331
"<content-length>%zu</content-length>"
347332
"<user>%s</user>"
348333
"<script>%s</script>"
349-
#ifdef HAVE_FPM_LQ
350334
"<last-request-cpu>%.2f</last-request-cpu>"
351-
#endif
352335
"<last-request-memory>%zu</last-request-memory>"
353336
"</process>\n"
354337
;
@@ -367,11 +350,9 @@ int fpm_status_handle_request(void) /* {{{ */
367350
"\"start time\":%s,"
368351
"\"start since\":%lu,"
369352
"\"accepted conn\":%lu,"
370-
#ifdef HAVE_FPM_LQ
371353
"\"listen queue\":%d,"
372354
"\"max listen queue\":%d,"
373355
"\"listen queue len\":%u,"
374-
#endif
375356
"\"idle processes\":%d,"
376357
"\"active processes\":%d,"
377358
"\"total processes\":%d,"
@@ -397,9 +378,7 @@ int fpm_status_handle_request(void) /* {{{ */
397378
"\"content length\":%zu,"
398379
"\"user\":\"%s\","
399380
"\"script\":\"%s\","
400-
#ifdef HAVE_FPM_LQ
401381
"\"last request cpu\":%.2f,"
402-
#endif
403382
"\"last request memory\":%zu"
404383
"}";
405384

@@ -417,11 +396,9 @@ int fpm_status_handle_request(void) /* {{{ */
417396
"start time: %s\n"
418397
"start since: %lu\n"
419398
"accepted conn: %lu\n"
420-
#ifdef HAVE_FPM_LQ
421399
"listen queue: %d\n"
422400
"max listen queue: %d\n"
423401
"listen queue len: %u\n"
424-
#endif
425402
"idle processes: %d\n"
426403
"active processes: %d\n"
427404
"total processes: %d\n"
@@ -444,9 +421,7 @@ int fpm_status_handle_request(void) /* {{{ */
444421
"content length: %zu\n"
445422
"user: %s\n"
446423
"script: %s\n"
447-
#ifdef HAVE_FPM_LQ
448424
"last request cpu: %.2f\n"
449-
#endif
450425
"last request memory: %zu\n";
451426
}
452427
}
@@ -459,11 +434,9 @@ int fpm_status_handle_request(void) /* {{{ */
459434
time_buffer,
460435
(unsigned long) (now_epoch - scoreboard.start_epoch),
461436
scoreboard.requests,
462-
#ifdef HAVE_FPM_LQ
463437
scoreboard.lq,
464438
scoreboard.lq_max,
465439
scoreboard.lq_len,
466-
#endif
467440
scoreboard.idle,
468441
scoreboard.active,
469442
scoreboard.idle + scoreboard.active,
@@ -486,9 +459,7 @@ int fpm_status_handle_request(void) /* {{{ */
486459
zend_string *tmp_query_string;
487460
char *query_string;
488461
struct timeval duration, now;
489-
#ifdef HAVE_FPM_LQ
490462
float cpu;
491-
#endif
492463

493464
fpm_clock_get(&now);
494465

@@ -522,14 +493,12 @@ int fpm_status_handle_request(void) /* {{{ */
522493
}
523494
}
524495

525-
#ifdef HAVE_FPM_LQ
526496
/* prevent NaN */
527497
if (proc.cpu_duration.tv_sec == 0 && proc.cpu_duration.tv_usec == 0) {
528498
cpu = 0.;
529499
} else {
530500
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.;
531501
}
532-
#endif
533502

534503
if (proc.request_stage == FPM_REQUEST_ACCEPTING) {
535504
duration = proc.duration;
@@ -551,9 +520,7 @@ int fpm_status_handle_request(void) /* {{{ */
551520
proc.content_length,
552521
proc.auth_user[0] != '\0' ? proc.auth_user : "-",
553522
proc.script_filename[0] != '\0' ? proc.script_filename : "-",
554-
#ifdef HAVE_FPM_LQ
555523
proc.request_stage == FPM_REQUEST_ACCEPTING ? cpu : 0.,
556-
#endif
557524
proc.request_stage == FPM_REQUEST_ACCEPTING ? proc.memory : 0);
558525
PUTS(buffer);
559526
efree(buffer);

0 commit comments

Comments
 (0)