diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2020-09-01 21:22:49 -0400 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2020-10-11 11:43:06 -0400 |
| commit | 0f9ec8b755a8a893ac5b182685a29dfb4f000dae (patch) | |
| tree | 2ad2e6dabec1cdf6fc53e9724c7683c623165023 /src/mod_status.c | |
| parent | 878073d1c9192e0d94f0e31f550009da75e3bb7d (diff) | |
| download | lighttpd-git-0f9ec8b755a8a893ac5b182685a29dfb4f000dae.tar.gz | |
[mod_status] dedicated funcs for r->state labels
fork connection_get_state() for use by mod_status, which
might in the future choose to display different labels.
move and rename connection_get_short_state() into mod_status,
as the func is used only by mod_status
(connection_get_state() is currently used elsewhere only for debugging
in connections.c)
Diffstat (limited to 'src/mod_status.c')
| -rw-r--r-- | src/mod_status.c | 51 |
1 files changed, 45 insertions, 6 deletions
diff --git a/src/mod_status.c b/src/mod_status.c index 9f6302ab..5e1882cf 100644 --- a/src/mod_status.c +++ b/src/mod_status.c @@ -1,7 +1,6 @@ #include "first.h" #include "base.h" -#include "connections.h" #include "fdevent.h" #include "h2.h" #include "http_header.h" @@ -121,6 +120,46 @@ SETDEFAULTS_FUNC(mod_status_set_defaults) { +static const char * +mod_status_get_state (request_state_t state) +{ + switch (state) { + case CON_STATE_CONNECT: return "connect"; + case CON_STATE_READ: return "read"; + case CON_STATE_READ_POST: return "readpost"; + case CON_STATE_WRITE: return "write"; + case CON_STATE_CLOSE: return "close"; + case CON_STATE_ERROR: return "error"; + case CON_STATE_HANDLE_REQUEST: return "handle-req"; + case CON_STATE_REQUEST_START: return "req-start"; + case CON_STATE_REQUEST_END: return "req-end"; + case CON_STATE_RESPONSE_START: return "resp-start"; + case CON_STATE_RESPONSE_END: return "resp-end"; + default: return "(unknown)"; + } +} + + +static const char * +mod_status_get_short_state (request_state_t state) +{ + switch (state) { + case CON_STATE_CONNECT: return "."; + case CON_STATE_READ: return "r"; + case CON_STATE_READ_POST: return "R"; + case CON_STATE_WRITE: return "W"; + case CON_STATE_CLOSE: return "C"; + case CON_STATE_ERROR: return "E"; + case CON_STATE_HANDLE_REQUEST: return "h"; + case CON_STATE_REQUEST_START: return "q"; + case CON_STATE_REQUEST_END: return "Q"; + case CON_STATE_RESPONSE_START: return "s"; + case CON_STATE_RESPONSE_END: return "S"; + default: return "x"; + } +} + + static int mod_status_row_append(buffer *b, const char *key, const char *value) { buffer_append_string_len(b, CONST_STR_LEN(" <tr>\n")); buffer_append_string_len(b, CONST_STR_LEN(" <td><b>")); @@ -201,7 +240,7 @@ static void mod_status_html_rtable_r (buffer * const b, const request_st * const buffer_append_string_len(b, CONST_STR_LEN("keep-alive")); } else - buffer_append_string(b, connection_get_state(r->state)); + buffer_append_string(b, mod_status_get_state(r->state)); buffer_append_string_len(b, CONST_STR_LEN("</td><td class=\"int\">")); @@ -542,7 +581,7 @@ static handler_t mod_status_handle_server_status_html(server *srv, request_st * state = "k"; ++cstates[CON_STATE_CLOSE+2]; } else { - state = connection_get_short_state(cr->state); + state = mod_status_get_short_state(cr->state); ++cstates[(cr->state <= CON_STATE_CLOSE ? cr->state : CON_STATE_CLOSE+1)]; } @@ -563,9 +602,9 @@ static handler_t mod_status_handle_server_status_html(server *srv, request_st * buffer_append_string_len(b, CONST_STR_LEN("<tr><td style=\"text-align:right\">")); buffer_append_int(b, cstates[j]); buffer_append_string_len(b, CONST_STR_LEN("</td><td> ")); - buffer_append_string_len(b, connection_get_short_state(j), 1); + buffer_append_string_len(b, mod_status_get_short_state(j), 1); buffer_append_string_len(b, CONST_STR_LEN(" = ")); - buffer_append_string(b, connection_get_state(j)); + buffer_append_string(b, mod_status_get_state(j)); buffer_append_string_len(b, CONST_STR_LEN("</td></tr>\n")); } buffer_append_string_len(b, CONST_STR_LEN("</table>")); @@ -628,7 +667,7 @@ static handler_t mod_status_handle_server_status_text(server *srv, request_st * ((c->h2 && 0 == c->h2->rused) || (CON_STATE_READ == cr->state && !buffer_string_is_empty(&cr->target_orig))) ? "k" - : connection_get_short_state(cr->state); + : mod_status_get_short_state(cr->state); buffer_append_string_len(b, state, 1); } for (uint32_t i = 0; i < srv->conns.size - srv->conns.used; ++i) { |