@@ -53,7 +53,6 @@ int fpm_status_export_to_zval(zval *status)
53
53
double cpu ;
54
54
int i ;
55
55
56
-
57
56
scoreboard_p = fpm_scoreboard_acquire (NULL , 1 );
58
57
if (!scoreboard_p ) {
59
58
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)
85
84
add_assoc_long (status , "start-time" , scoreboard .start_epoch );
86
85
add_assoc_long (status , "start-since" , now_epoch - scoreboard .start_epoch );
87
86
add_assoc_long (status , "accepted-conn" , scoreboard .requests );
88
- #ifdef HAVE_FPM_LQ
89
87
add_assoc_long (status , "listen-queue" , scoreboard .lq );
90
88
add_assoc_long (status , "max-listen-queue" , scoreboard .lq_max );
91
89
add_assoc_long (status , "listen-queue-len" , scoreboard .lq_len );
92
- #endif
93
90
add_assoc_long (status , "idle-processes" , scoreboard .idle );
94
91
add_assoc_long (status , "active-processes" , scoreboard .active );
95
92
add_assoc_long (status , "total-processes" , scoreboard .idle + scoreboard .active );
@@ -103,14 +100,12 @@ int fpm_status_export_to_zval(zval *status)
103
100
continue ;
104
101
}
105
102
proc_p = & procs [i ];
106
- #ifdef HAVE_FPM_LQ
107
103
/* prevent NaN */
108
104
if (procs [i ].cpu_duration .tv_sec == 0 && procs [i ].cpu_duration .tv_usec == 0 ) {
109
105
cpu = 0. ;
110
106
} else {
111
107
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. ;
112
108
}
113
- #endif
114
109
115
110
array_init (& fpm_proc_stat );
116
111
add_assoc_long (& fpm_proc_stat , "pid" , procs [i ].pid );
@@ -130,9 +125,7 @@ int fpm_status_export_to_zval(zval *status)
130
125
add_assoc_long (& fpm_proc_stat , "request-length" , procs [i ].content_length );
131
126
add_assoc_string (& fpm_proc_stat , "user" , procs [i ].auth_user [0 ] != '\0' ? procs [i ].auth_user : "-" );
132
127
add_assoc_string (& fpm_proc_stat , "script" , procs [i ].script_filename [0 ] != '\0' ? procs [i ].script_filename : "-" );
133
- #ifdef HAVE_FPM_LQ
134
128
add_assoc_double (& fpm_proc_stat , "last-request-cpu" , procs [i ].request_stage == FPM_REQUEST_ACCEPTING ? cpu : 0. );
135
- #endif
136
129
add_assoc_long (& fpm_proc_stat , "last-request-memory" , procs [i ].request_stage == FPM_REQUEST_ACCEPTING ? procs [i ].memory : 0 );
137
130
add_next_index_zval (& fpm_proc_stats , & fpm_proc_stat );
138
131
}
@@ -245,11 +238,9 @@ int fpm_status_handle_request(void) /* {{{ */
245
238
"<tr><th>start time</th><td>%s</td></tr>\n"
246
239
"<tr><th>start since</th><td>%lu</td></tr>\n"
247
240
"<tr><th>accepted conn</th><td>%lu</td></tr>\n"
248
- #ifdef HAVE_FPM_LQ
249
241
"<tr><th>listen queue</th><td>%d</td></tr>\n"
250
242
"<tr><th>max listen queue</th><td>%d</td></tr>\n"
251
243
"<tr><th>listen queue len</th><td>%u</td></tr>\n"
252
- #endif
253
244
"<tr><th>idle processes</th><td>%d</td></tr>\n"
254
245
"<tr><th>active processes</th><td>%d</td></tr>\n"
255
246
"<tr><th>total processes</th><td>%d</td></tr>\n"
@@ -275,9 +266,7 @@ int fpm_status_handle_request(void) /* {{{ */
275
266
"<th>content length</th>"
276
267
"<th>user</th>"
277
268
"<th>script</th>"
278
- #ifdef HAVE_FPM_LQ
279
269
"<th>last request cpu</th>"
280
- #endif
281
270
"<th>last request memory</th>"
282
271
"</tr>\n" ;
283
272
@@ -294,9 +283,7 @@ int fpm_status_handle_request(void) /* {{{ */
294
283
"<td>%zu</td>"
295
284
"<td>%s</td>"
296
285
"<td>%s</td>"
297
- #ifdef HAVE_FPM_LQ
298
286
"<td>%.2f</td>"
299
- #endif
300
287
"<td>%zu</td>"
301
288
"</tr>\n" ;
302
289
@@ -317,11 +304,9 @@ int fpm_status_handle_request(void) /* {{{ */
317
304
"<start-time>%s</start-time>\n"
318
305
"<start-since>%lu</start-since>\n"
319
306
"<accepted-conn>%lu</accepted-conn>\n"
320
- #ifdef HAVE_FPM_LQ
321
307
"<listen-queue>%d</listen-queue>\n"
322
308
"<max-listen-queue>%d</max-listen-queue>\n"
323
309
"<listen-queue-len>%u</listen-queue-len>\n"
324
- #endif
325
310
"<idle-processes>%d</idle-processes>\n"
326
311
"<active-processes>%d</active-processes>\n"
327
312
"<total-processes>%d</total-processes>\n"
@@ -346,9 +331,7 @@ int fpm_status_handle_request(void) /* {{{ */
346
331
"<content-length>%zu</content-length>"
347
332
"<user>%s</user>"
348
333
"<script>%s</script>"
349
- #ifdef HAVE_FPM_LQ
350
334
"<last-request-cpu>%.2f</last-request-cpu>"
351
- #endif
352
335
"<last-request-memory>%zu</last-request-memory>"
353
336
"</process>\n"
354
337
;
@@ -367,11 +350,9 @@ int fpm_status_handle_request(void) /* {{{ */
367
350
"\"start time\":%s,"
368
351
"\"start since\":%lu,"
369
352
"\"accepted conn\":%lu,"
370
- #ifdef HAVE_FPM_LQ
371
353
"\"listen queue\":%d,"
372
354
"\"max listen queue\":%d,"
373
355
"\"listen queue len\":%u,"
374
- #endif
375
356
"\"idle processes\":%d,"
376
357
"\"active processes\":%d,"
377
358
"\"total processes\":%d,"
@@ -397,9 +378,7 @@ int fpm_status_handle_request(void) /* {{{ */
397
378
"\"content length\":%zu,"
398
379
"\"user\":\"%s\","
399
380
"\"script\":\"%s\","
400
- #ifdef HAVE_FPM_LQ
401
381
"\"last request cpu\":%.2f,"
402
- #endif
403
382
"\"last request memory\":%zu"
404
383
"}" ;
405
384
@@ -417,11 +396,9 @@ int fpm_status_handle_request(void) /* {{{ */
417
396
"start time: %s\n"
418
397
"start since: %lu\n"
419
398
"accepted conn: %lu\n"
420
- #ifdef HAVE_FPM_LQ
421
399
"listen queue: %d\n"
422
400
"max listen queue: %d\n"
423
401
"listen queue len: %u\n"
424
- #endif
425
402
"idle processes: %d\n"
426
403
"active processes: %d\n"
427
404
"total processes: %d\n"
@@ -444,9 +421,7 @@ int fpm_status_handle_request(void) /* {{{ */
444
421
"content length: %zu\n"
445
422
"user: %s\n"
446
423
"script: %s\n"
447
- #ifdef HAVE_FPM_LQ
448
424
"last request cpu: %.2f\n"
449
- #endif
450
425
"last request memory: %zu\n" ;
451
426
}
452
427
}
@@ -459,11 +434,9 @@ int fpm_status_handle_request(void) /* {{{ */
459
434
time_buffer ,
460
435
(unsigned long ) (now_epoch - scoreboard .start_epoch ),
461
436
scoreboard .requests ,
462
- #ifdef HAVE_FPM_LQ
463
437
scoreboard .lq ,
464
438
scoreboard .lq_max ,
465
439
scoreboard .lq_len ,
466
- #endif
467
440
scoreboard .idle ,
468
441
scoreboard .active ,
469
442
scoreboard .idle + scoreboard .active ,
@@ -486,9 +459,7 @@ int fpm_status_handle_request(void) /* {{{ */
486
459
zend_string * tmp_query_string ;
487
460
char * query_string ;
488
461
struct timeval duration , now ;
489
- #ifdef HAVE_FPM_LQ
490
462
float cpu ;
491
- #endif
492
463
493
464
fpm_clock_get (& now );
494
465
@@ -522,14 +493,12 @@ int fpm_status_handle_request(void) /* {{{ */
522
493
}
523
494
}
524
495
525
- #ifdef HAVE_FPM_LQ
526
496
/* prevent NaN */
527
497
if (proc .cpu_duration .tv_sec == 0 && proc .cpu_duration .tv_usec == 0 ) {
528
498
cpu = 0. ;
529
499
} else {
530
500
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. ;
531
501
}
532
- #endif
533
502
534
503
if (proc .request_stage == FPM_REQUEST_ACCEPTING ) {
535
504
duration = proc .duration ;
@@ -551,9 +520,7 @@ int fpm_status_handle_request(void) /* {{{ */
551
520
proc .content_length ,
552
521
proc .auth_user [0 ] != '\0' ? proc .auth_user : "-" ,
553
522
proc .script_filename [0 ] != '\0' ? proc .script_filename : "-" ,
554
- #ifdef HAVE_FPM_LQ
555
523
proc .request_stage == FPM_REQUEST_ACCEPTING ? cpu : 0. ,
556
- #endif
557
524
proc .request_stage == FPM_REQUEST_ACCEPTING ? proc .memory : 0 );
558
525
PUTS (buffer );
559
526
efree (buffer );
0 commit comments