mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-11 10:54:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed bug #62887 (Only /status?plain&full gives "last request cpu")

Browse Source
This commit is contained in:
Jerome Loyet 2012-09-28 01:26:20 +02:00
parent 9ed421e3d7
commit 68eb608f3c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sapi/fpm/fpm/fpm_status.c
View File

@ -148,7 +148,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
"<tr><th>start time</th><td>%s</td></tr>\n" "<tr><th>start time</th><td>%s</td></tr>\n"
"<tr><th>start since</th><td>%lu</td></tr>\n" "<tr><th>start since</th><td>%lu</td></tr>\n"
"<tr><th>accepted conn</th><td>%lu</td></tr>\n" "<tr><th>accepted conn</th><td>%lu</td></tr>\n"
#if HAVE_FPM_LQ #ifdef HAVE_FPM_LQ
"<tr><th>listen queue</th><td>%u</td></tr>\n" "<tr><th>listen queue</th><td>%u</td></tr>\n"
"<tr><th>max listen queue</th><td>%u</td></tr>\n" "<tr><th>max listen queue</th><td>%u</td></tr>\n"
"<tr><th>listen queue len</th><td>%d</td></tr>\n" "<tr><th>listen queue len</th><td>%d</td></tr>\n"
@ -178,7 +178,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
"<th>content length</th>" "<th>content length</th>"
"<th>user</th>" "<th>user</th>"
"<th>script</th>" "<th>script</th>"
#if HAVE_FPM_LQ #ifdef HAVE_FPM_LQ
"<th>last request cpu</th>" "<th>last request cpu</th>"
#endif #endif
"<th>last request memory</th>" "<th>last request memory</th>"
@ -197,7 +197,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
"<td>%zu</td>" "<td>%zu</td>"
"<td>%s</td>" "<td>%s</td>"
"<td>%s</td>" "<td>%s</td>"
#if HAVE_FPM_LQ #ifdef HAVE_FPM_LQ
"<td>%.2f</td>" "<td>%.2f</td>"
#endif #endif
"<td>%zu</td>" "<td>%zu</td>"
@ -220,7 +220,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
"<start-time>%s</start-time>\n" "<start-time>%s</start-time>\n"
"<start-since>%lu</start-since>\n" "<start-since>%lu</start-since>\n"
"<accepted-conn>%lu</accepted-conn>\n" "<accepted-conn>%lu</accepted-conn>\n"
#if HAVE_FPM_LQ #ifdef HAVE_FPM_LQ
"<listen-queue>%u</listen-queue>\n" "<listen-queue>%u</listen-queue>\n"
"<max-listen-queue>%u</max-listen-queue>\n" "<max-listen-queue>%u</max-listen-queue>\n"
"<listen-queue-len>%d</listen-queue-len>\n" "<listen-queue-len>%d</listen-queue-len>\n"
@ -249,7 +249,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
"<content-length>%zu</content-length>" "<content-length>%zu</content-length>"
"<user>%s</user>" "<user>%s</user>"
"<script>%s</script>" "<script>%s</script>"
#if HAVE_FPM_LQ #ifdef HAVE_FPM_LQ
"<last-request-cpu>%.2f</last-request-cpu>" "<last-request-cpu>%.2f</last-request-cpu>"
#endif #endif
"<last-request-memory>%zu</last-request-memory>" "<last-request-memory>%zu</last-request-memory>"
@ -270,7 +270,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
"\"start time\":%s," "\"start time\":%s,"
"\"start since\":%lu," "\"start since\":%lu,"
"\"accepted conn\":%lu," "\"accepted conn\":%lu,"
#if HAVE_FPM_LQ #ifdef HAVE_FPM_LQ
"\"listen queue\":%u," "\"listen queue\":%u,"
"\"max listen queue\":%u," "\"max listen queue\":%u,"
"\"listen queue len\":%d," "\"listen queue len\":%d,"
@ -300,7 +300,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
"\"content length\":%zu," "\"content length\":%zu,"
"\"user\":\"%s\"," "\"user\":\"%s\","
"\"script\":\"%s\"," "\"script\":\"%s\","
#if HAVE_FPM_LQ #ifdef HAVE_FPM_LQ
"\"last request cpu\":%.2f," "\"last request cpu\":%.2f,"
#endif #endif
"\"last request memory\":%zu" "\"last request memory\":%zu"
@ -320,7 +320,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
"start time: %s\n" "start time: %s\n"
"start since: %lu\n" "start since: %lu\n"
"accepted conn: %lu\n" "accepted conn: %lu\n"
#if HAVE_FPM_LQ #ifdef HAVE_FPM_LQ
"listen queue: %u\n" "listen queue: %u\n"
"max listen queue: %u\n" "max listen queue: %u\n"
"listen queue len: %d\n" "listen queue len: %d\n"
@ -362,7 +362,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */
time_buffer, time_buffer,
now_epoch - scoreboard.start_epoch, now_epoch - scoreboard.start_epoch,
scoreboard.requests, scoreboard.requests,
#if HAVE_FPM_LQ #ifdef HAVE_FPM_LQ
scoreboard.lq, scoreboard.lq,
scoreboard.lq_max, scoreboard.lq_max,
scoreboard.lq_len, scoreboard.lq_len,