Skip to content

Commit 4757323

Browse files
GirgiasGirgias
committed
Review
1 parent 59a00c4 commit 4757323

File tree

1 file changed

+1
-35
lines changed

1 file changed

+1
-35
lines changed

‎sapi/fpm/fpm/fpm_status.c

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,8 @@ int fpm_status_export_to_zval(zval *status)
5050
zval fpm_proc_stats, fpm_proc_stat;
5151
time_t now_epoch;
5252
struct timeval duration, now;
53-
int i;
54-
#if HAVE_FPM_LQ
5553
double cpu;
56-
#endif
54+
int i;
5755

5856
scoreboard_p = fpm_scoreboard_acquire(NULL, 1);
5957
if (!scoreboard_p) {
@@ -86,11 +84,9 @@ int fpm_status_export_to_zval(zval *status)
8684
add_assoc_long(status, "start-time", scoreboard.start_epoch);
8785
add_assoc_long(status, "start-since", now_epoch - scoreboard.start_epoch);
8886
add_assoc_long(status, "accepted-conn", scoreboard.requests);
89-
#if HAVE_FPM_LQ
9087
add_assoc_long(status, "listen-queue", scoreboard.lq);
9188
add_assoc_long(status, "max-listen-queue", scoreboard.lq_max);
9289
add_assoc_long(status, "listen-queue-len", scoreboard.lq_len);
93-
#endif
9490
add_assoc_long(status, "idle-processes", scoreboard.idle);
9591
add_assoc_long(status, "active-processes", scoreboard.active);
9692
add_assoc_long(status, "total-processes", scoreboard.idle + scoreboard.active);
@@ -104,14 +100,12 @@ int fpm_status_export_to_zval(zval *status)
104100
continue;
105101
}
106102
proc_p = &procs[i];
107-
#if HAVE_FPM_LQ
108103
/* prevent NaN */
109104
if (procs[i].cpu_duration.tv_sec == 0 && procs[i].cpu_duration.tv_usec == 0) {
110105
cpu = 0.;
111106
} else {
112107
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.;
113108
}
114-
#endif
115109

116110
array_init(&fpm_proc_stat);
117111
add_assoc_long(&fpm_proc_stat, "pid", procs[i].pid);
@@ -131,9 +125,7 @@ int fpm_status_export_to_zval(zval *status)
131125
add_assoc_long(&fpm_proc_stat, "request-length", procs[i].content_length);
132126
add_assoc_string(&fpm_proc_stat, "user", procs[i].auth_user[0] != '\0' ? procs[i].auth_user : "-");
133127
add_assoc_string(&fpm_proc_stat, "script", procs[i].script_filename[0] != '\0' ? procs[i].script_filename : "-");
134-
#if HAVE_FPM_LQ
135128
add_assoc_double(&fpm_proc_stat, "last-request-cpu", procs[i].request_stage == FPM_REQUEST_ACCEPTING ? cpu : 0.);
136-
#endif
137129
add_assoc_long(&fpm_proc_stat, "last-request-memory", procs[i].request_stage == FPM_REQUEST_ACCEPTING ? procs[i].memory : 0);
138130
add_next_index_zval(&fpm_proc_stats, &fpm_proc_stat);
139131
}
@@ -246,11 +238,9 @@ int fpm_status_handle_request(void) /* {{{ */
246238
"<tr><th>start time</th><td>%s</td></tr>\n"
247239
"<tr><th>start since</th><td>%lu</td></tr>\n"
248240
"<tr><th>accepted conn</th><td>%lu</td></tr>\n"
249-
#if HAVE_FPM_LQ
250241
"<tr><th>listen queue</th><td>%d</td></tr>\n"
251242
"<tr><th>max listen queue</th><td>%d</td></tr>\n"
252243
"<tr><th>listen queue len</th><td>%u</td></tr>\n"
253-
#endif
254244
"<tr><th>idle processes</th><td>%d</td></tr>\n"
255245
"<tr><th>active processes</th><td>%d</td></tr>\n"
256246
"<tr><th>total processes</th><td>%d</td></tr>\n"
@@ -276,9 +266,7 @@ int fpm_status_handle_request(void) /* {{{ */
276266
"<th>content length</th>"
277267
"<th>user</th>"
278268
"<th>script</th>"
279-
#if HAVE_FPM_LQ
280269
"<th>last request cpu</th>"
281-
#endif
282270
"<th>last request memory</th>"
283271
"</tr>\n";
284272

@@ -295,9 +283,7 @@ int fpm_status_handle_request(void) /* {{{ */
295283
"<td>%zu</td>"
296284
"<td>%s</td>"
297285
"<td>%s</td>"
298-
#if HAVE_FPM_LQ
299286
"<td>%.2f</td>"
300-
#endif
301287
"<td>%zu</td>"
302288
"</tr>\n";
303289

@@ -318,11 +304,9 @@ int fpm_status_handle_request(void) /* {{{ */
318304
"<start-time>%s</start-time>\n"
319305
"<start-since>%lu</start-since>\n"
320306
"<accepted-conn>%lu</accepted-conn>\n"
321-
#if HAVE_FPM_LQ
322307
"<listen-queue>%d</listen-queue>\n"
323308
"<max-listen-queue>%d</max-listen-queue>\n"
324309
"<listen-queue-len>%u</listen-queue-len>\n"
325-
#endif
326310
"<idle-processes>%d</idle-processes>\n"
327311
"<active-processes>%d</active-processes>\n"
328312
"<total-processes>%d</total-processes>\n"
@@ -347,9 +331,7 @@ int fpm_status_handle_request(void) /* {{{ */
347331
"<content-length>%zu</content-length>"
348332
"<user>%s</user>"
349333
"<script>%s</script>"
350-
#if HAVE_FPM_LQ
351334
"<last-request-cpu>%.2f</last-request-cpu>"
352-
#endif
353335
"<last-request-memory>%zu</last-request-memory>"
354336
"</process>\n"
355337
;
@@ -368,11 +350,9 @@ int fpm_status_handle_request(void) /* {{{ */
368350
"\"start time\":%s,"
369351
"\"start since\":%lu,"
370352
"\"accepted conn\":%lu,"
371-
#if HAVE_FPM_LQ
372353
"\"listen queue\":%d,"
373354
"\"max listen queue\":%d,"
374355
"\"listen queue len\":%u,"
375-
#endif
376356
"\"idle processes\":%d,"
377357
"\"active processes\":%d,"
378358
"\"total processes\":%d,"
@@ -398,9 +378,7 @@ int fpm_status_handle_request(void) /* {{{ */
398378
"\"content length\":%zu,"
399379
"\"user\":\"%s\","
400380
"\"script\":\"%s\","
401-
#if HAVE_FPM_LQ
402381
"\"last request cpu\":%.2f,"
403-
#endif
404382
"\"last request memory\":%zu"
405383
"}";
406384

@@ -418,11 +396,9 @@ int fpm_status_handle_request(void) /* {{{ */
418396
"start time: %s\n"
419397
"start since: %lu\n"
420398
"accepted conn: %lu\n"
421-
#if HAVE_FPM_LQ
422399
"listen queue: %d\n"
423400
"max listen queue: %d\n"
424401
"listen queue len: %u\n"
425-
#endif
426402
"idle processes: %d\n"
427403
"active processes: %d\n"
428404
"total processes: %d\n"
@@ -445,9 +421,7 @@ int fpm_status_handle_request(void) /* {{{ */
445421
"content length: %zu\n"
446422
"user: %s\n"
447423
"script: %s\n"
448-
#if HAVE_FPM_LQ
449424
"last request cpu: %.2f\n"
450-
#endif
451425
"last request memory: %zu\n";
452426
}
453427
}
@@ -460,11 +434,9 @@ int fpm_status_handle_request(void) /* {{{ */
460434
time_buffer,
461435
(unsigned long) (now_epoch - scoreboard.start_epoch),
462436
scoreboard.requests,
463-
#if HAVE_FPM_LQ
464437
scoreboard.lq,
465438
scoreboard.lq_max,
466439
scoreboard.lq_len,
467-
#endif
468440
scoreboard.idle,
469441
scoreboard.active,
470442
scoreboard.idle + scoreboard.active,
@@ -487,9 +459,7 @@ int fpm_status_handle_request(void) /* {{{ */
487459
zend_string *tmp_query_string;
488460
char *query_string;
489461
struct timeval duration, now;
490-
#if HAVE_FPM_LQ
491462
float cpu;
492-
#endif
493463

494464
fpm_clock_get(&now);
495465

@@ -523,14 +493,12 @@ int fpm_status_handle_request(void) /* {{{ */
523493
}
524494
}
525495

526-
#if HAVE_FPM_LQ
527496
/* prevent NaN */
528497
if (proc.cpu_duration.tv_sec == 0 && proc.cpu_duration.tv_usec == 0) {
529498
cpu = 0.;
530499
} else {
531500
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.;
532501
}
533-
#endif
534502

535503
if (proc.request_stage == FPM_REQUEST_ACCEPTING) {
536504
duration = proc.duration;
@@ -552,9 +520,7 @@ int fpm_status_handle_request(void) /* {{{ */
552520
proc.content_length,
553521
proc.auth_user[0] != '\0' ? proc.auth_user : "-",
554522
proc.script_filename[0] != '\0' ? proc.script_filename : "-",
555-
#if HAVE_FPM_LQ
556523
proc.request_stage == FPM_REQUEST_ACCEPTING ? cpu : 0.,
557-
#endif
558524
proc.request_stage == FPM_REQUEST_ACCEPTING ? proc.memory : 0);
559525
PUTS(buffer);
560526
efree(buffer);

0 commit comments

Comments
 (0)