lighttpd
/
lighttpd2
2
0
Fork 0
Code Issues Releases Wiki Activity

change counter format output

Browse Source
personal/stbuehler/wip
Thomas Porzelt 14 years ago
parent 963564be72
commit a9c75934a8
3 changed files with 114 additions and 201 deletions
Show Stats Download Patch File Download Diff File

7
include/lighttpd/utils.h
Unescape Escape View File

@ -8,7 +8,6 @@
typedef enum {
COUNTER_TIME,
COUNTER_BYTES,
COUNTER_BITS,
COUNTER_UNITS
} counter_type;
@ -37,10 +36,8 @@ LI_API gchar *http_version_string(http_version_t method, guint *len);
/* converts a given 3 digit http status code to a gchar[3] string. e.g. 403 to {'4','0','3'} */
LI_API void http_status_to_str(gint status_code, gchar status_str[]);
/* */
LI_API gchar counter_format(guint64 *count, guint factor);
/* formats a given guint64 for output. accuracy can be a positiv integer or -1 for infinite */
LI_API GString *counter_format2(guint64 count, counter_type t, gint accuracy);
/* formats a given guint64 for output. if dest is NULL, a new string is allocated */
LI_API GString *counter_format(guint64 count, counter_type t, GString *dest);
LI_API gchar *ev_backend_string(guint backend);

126
src/modules/mod_status.c
Unescape Escape View File

@ -211,8 +211,11 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
g_slice_free(mod_status_job, job);
if (complete) {
GString *html;
GString *css;
GString *tmpstr;
GString *count_req, *count_bin, *count_bout;
guint uptime;
guint total_connections = 0;
/* we got everything */
@ -222,7 +225,16 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0),
0, 0, G_GUINT64_CONSTANT(0), 0, 0
};
GString *html = g_string_sized_new(8 * 1024);
uptime = CUR_TS(vr->con->wrk) - vr->con->srv->started;
if (!uptime)
uptime = 1;
html = g_string_sized_new(8 * 1024);
count_req = g_string_sized_new(10);
count_bin = g_string_sized_new(10);
count_bout = g_string_sized_new(10);
tmpstr = g_string_sized_new(10);
VR_DEBUG(vr, "finished collecting data: %s", complete ? "complete" : "not complete");
vr->response.http_status = 200;
@ -260,7 +272,7 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
" <body>\n"
));
tmpstr = counter_format2((guint64)(CUR_TS(vr->con->wrk) - vr->con->srv->started), COUNTER_TIME, -1);
counter_format((guint64)(CUR_TS(vr->con->wrk) - vr->con->srv->started), COUNTER_TIME, tmpstr);
g_string_append_printf(html, html_top,
vr->request.uri.host->str,
tmpstr->str,
@ -270,51 +282,38 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
/* worker information, absolute values */
{
GString *count_req, *count_bin, *count_bout;
g_string_append_len(html, CONST_STR_LEN(" <div class=\"title\"><strong>Absolute stats</strong> (since start)</div>\n"));
g_string_append_len(html, CONST_STR_LEN(" <div class=\"title\"><strong>Absolute stats</strong></div>\n"));
g_string_append_len(html, html_worker_th, sizeof(html_worker_th)-1);
#define PERCENTAGE(x, y) (y ? (x * 100 / y) : 0)
for (guint i = 0; i < result->len; i++) {
mod_status_wrk_data *sd = g_ptr_array_index(result, i);
count_req = counter_format2(sd->stats.requests, COUNTER_UNITS, -1);
count_bin = counter_format2(sd->stats.bytes_in, COUNTER_BYTES, 2);
count_bout = counter_format2(sd->stats.bytes_out, COUNTER_BYTES, 2);
counter_format(sd->stats.requests, COUNTER_UNITS, count_req);
counter_format(sd->stats.bytes_in, COUNTER_BYTES, count_bin);
counter_format(sd->stats.bytes_out, COUNTER_BYTES, count_bout);
g_string_printf(tmpstr, "Worker #%u", i+1);
g_string_append_printf(html, html_worker_row, "", tmpstr->str,
count_req->str, PERCENTAGE(sd->stats.requests, totals.requests),
count_bin->str, PERCENTAGE(sd->stats.bytes_in, totals.bytes_in),
count_bout->str, PERCENTAGE(sd->stats.bytes_out, totals.bytes_out),
sd->connections->len, PERCENTAGE(sd->connections->len, total_connections));
g_string_free(count_req, TRUE);
g_string_free(count_bin, TRUE);
g_string_free(count_bout, TRUE);
count_req->str, PERCENTAGE(sd->stats.requests, totals.requests),
count_bin->str, PERCENTAGE(sd->stats.bytes_in, totals.bytes_in),
count_bout->str, PERCENTAGE(sd->stats.bytes_out, totals.bytes_out),
sd->connections->len, PERCENTAGE(sd->connections->len, total_connections));
}
#undef PERCENTAGE
count_req = counter_format2(totals.requests, COUNTER_UNITS, -1);
count_bin = counter_format2(totals.bytes_in, COUNTER_BYTES, 2);
count_bout = counter_format2(totals.bytes_out, COUNTER_BYTES, 2);
counter_format(totals.requests, COUNTER_UNITS, count_req);
counter_format(totals.bytes_in, COUNTER_BYTES, count_bin);
counter_format(totals.bytes_out, COUNTER_BYTES, count_bout);
g_string_append_printf(html, html_worker_row, "totals", "Total",
count_req->str, G_GUINT64_CONSTANT(100),
count_bin->str, G_GUINT64_CONSTANT(100),
count_bout->str, G_GUINT64_CONSTANT(100),
total_connections, 100);
g_string_append_len(html, CONST_STR_LEN(" </table>\n"));
g_string_free(count_req, TRUE);
g_string_free(count_bin, TRUE);
g_string_free(count_bout, TRUE);
}
/* worker information, avg values */
{
GString *count_req, *count_bin, *count_bout;
guint uptime = CUR_TS(vr->con->wrk) - vr->con->srv->started;
if (!uptime)
uptime = 1;
g_string_append_len(html, CONST_STR_LEN("<div class=\"title\"><strong>Average stats</strong> (since start)</div>\n"));
g_string_append_len(html, html_worker_th_avg, sizeof(html_worker_th_avg)-1);
@ -323,9 +322,9 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
for (guint i = 0; i < result->len; i++) {
mod_status_wrk_data *sd = g_ptr_array_index(result, i);
count_req = counter_format2(sd->stats.requests / uptime, COUNTER_UNITS, -1);
count_bin = counter_format2(sd->stats.bytes_in / uptime, COUNTER_BYTES, 2);
count_bout = counter_format2(sd->stats.bytes_out / uptime, COUNTER_BYTES, 2);
counter_format(sd->stats.requests / uptime, COUNTER_UNITS, count_req);
counter_format(sd->stats.bytes_in / uptime, COUNTER_BYTES, count_bin);
counter_format(sd->stats.bytes_out / uptime, COUNTER_BYTES, count_bout);
g_string_printf(tmpstr, "Worker #%u", i+1);
g_string_append_printf(html, html_worker_row_avg, "", tmpstr->str,
count_req->str,
@ -333,15 +332,12 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
count_bout->str,
(guint)(sd->stats.active_cons_cum / uptime)
);
g_string_free(count_req, TRUE);
g_string_free(count_bin, TRUE);
g_string_free(count_bout, TRUE);
}
#undef PERCENTAGE
count_req = counter_format2(totals.requests / uptime, COUNTER_UNITS, -1);
count_bin = counter_format2(totals.bytes_in / uptime, COUNTER_BYTES, 2);
count_bout = counter_format2(totals.bytes_out / uptime, COUNTER_BYTES, 2);
counter_format(totals.requests / uptime, COUNTER_UNITS, count_req);
counter_format(totals.bytes_in / uptime, COUNTER_BYTES, count_bin);
counter_format(totals.bytes_out / uptime, COUNTER_BYTES, count_bout);
g_string_append_printf(html, html_worker_row_avg, "totals", "Total",
count_req->str,
count_bin->str,
@ -349,19 +345,11 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
(guint)(totals.active_cons_cum / uptime)
);
g_string_append_len(html, CONST_STR_LEN(" </table>\n"));
g_string_free(count_req, TRUE);
g_string_free(count_bin, TRUE);
g_string_free(count_bout, TRUE);
}
/* worker information, 5 seconds avg values */
{
GString *count_req, *count_bin, *count_bout;
time_t uptime = CUR_TS(vr->con->wrk) - vr->con->srv->started;
if (!uptime)
uptime = 1;
g_string_append_len(html, CONST_STR_LEN("<div class=\"title\"><strong>Average stats</strong> (5 seconds)</div>\n"));
g_string_append_len(html, html_worker_th_avg, sizeof(html_worker_th_avg)-1);
@ -370,9 +358,9 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
for (guint i = 0; i < result->len; i++) {
mod_status_wrk_data *sd = g_ptr_array_index(result, i);
count_req = counter_format2(sd->stats.requests_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_UNITS, -1);
count_bin = counter_format2(sd->stats.bytes_in_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_BYTES, 2);
count_bout = counter_format2(sd->stats.bytes_out_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_BYTES, 2);
counter_format(sd->stats.requests_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_UNITS, count_req);
counter_format(sd->stats.bytes_in_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_BYTES, count_bin);
counter_format(sd->stats.bytes_out_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_BYTES, count_bout);
g_string_printf(tmpstr, "Worker #%u", i+1);
g_string_append_printf(html, html_worker_row_avg, "", tmpstr->str,
count_req->str,
@ -380,15 +368,12 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
count_bout->str,
sd->stats.active_cons_5s
);
g_string_free(count_req, TRUE);
g_string_free(count_bin, TRUE);
g_string_free(count_bout, TRUE);
}
#undef PERCENTAGE
count_req = counter_format2(totals.requests_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_UNITS, -1);
count_bin = counter_format2(totals.bytes_in_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_BYTES, 2);
count_bout = counter_format2(totals.bytes_out_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_BYTES, 2);
counter_format(totals.requests_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_UNITS, count_req);
counter_format(totals.bytes_in_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_BYTES, count_bin);
counter_format(totals.bytes_out_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_BYTES, count_bout);
g_string_append_printf(html, html_worker_row_avg, "totals", "Total",
count_req->str,
count_bin->str,
@ -396,14 +381,18 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
totals.active_cons_5s
);
g_string_append_len(html, CONST_STR_LEN(" </table>\n"));
g_string_free(count_req, TRUE);
g_string_free(count_bin, TRUE);
g_string_free(count_bout, TRUE);
}
/* list connections */
{
GString *ts, *bytes_in, *bytes_out, *bytes_in_5s, *bytes_out_5s;
ts = g_string_sized_new(16);
bytes_in = g_string_sized_new(10);
bytes_out = g_string_sized_new(10);
bytes_in_5s = g_string_sized_new(10);
bytes_out_5s = g_string_sized_new(10);
g_string_append_len(html, CONST_STR_LEN("<div class=\"title\"><strong>Active connections</strong></div>\n"));
g_string_append_len(html, html_connections_th, sizeof(html_connections_th)-1);
for (guint i = 0; i < result->len; i++) {
@ -411,11 +400,11 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
for (guint j = 0; j < sd->connections->len; j++) {
mod_status_con_data *cd = &g_array_index(sd->connections, mod_status_con_data, j);
ts = counter_format2((guint64)(CUR_TS(vr->con->wrk) - cd->ts), COUNTER_TIME, -1);
bytes_in = counter_format2(cd->bytes_in, COUNTER_BYTES, 1);
bytes_in_5s = counter_format2(cd->bytes_in_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_BYTES, 1);
bytes_out = counter_format2(cd->bytes_out, COUNTER_BYTES, 1);
bytes_out_5s = counter_format2(cd->bytes_out_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_BYTES, 1);
counter_format((guint64)(CUR_TS(vr->con->wrk) - cd->ts), COUNTER_TIME, ts);
counter_format(cd->bytes_in, COUNTER_BYTES, bytes_in);
counter_format(cd->bytes_in_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_BYTES, bytes_in_5s);
counter_format(cd->bytes_out, COUNTER_BYTES, bytes_out);
counter_format(cd->bytes_out_5s_diff / G_GUINT64_CONSTANT(5), COUNTER_BYTES, bytes_out_5s);
g_string_append_printf(html, html_connections_row,
cd->remote_addr_str->str,
@ -433,15 +422,18 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
g_string_free(cd->local_addr_str, TRUE);
g_string_free(cd->host, TRUE);
g_string_free(cd->path, TRUE);
g_string_free(ts, TRUE);
g_string_free(bytes_in, TRUE);
g_string_free(bytes_in_5s, TRUE);
g_string_free(bytes_out, TRUE);
g_string_free(bytes_out_5s, TRUE);
}
g_array_free(sd->connections, TRUE);
}
g_string_append_len(html, CONST_STR_LEN(" </table>\n"));
g_string_free(ts, TRUE);
g_string_free(bytes_in, TRUE);
g_string_free(bytes_in_5s, TRUE);
g_string_free(bytes_out, TRUE);
g_string_free(bytes_out_5s, TRUE);
}
/* free stats */
@ -456,6 +448,10 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
));
chunkqueue_append_string(vr->con->out, html);
http_header_overwrite(vr->response.headers, CONST_STR_LEN("Content-Type"), CONST_STR_LEN("text/html"));
g_string_free(count_req, TRUE);
g_string_free(count_bin, TRUE);
g_string_free(count_bout, TRUE);
g_string_free(tmpstr, TRUE);
vrequest_handle_direct(vr);

182
src/utils.c
Unescape Escape View File

@ -298,146 +298,66 @@ void http_status_to_str(gint status_code, gchar status_str[]) {
}
gchar counter_format(guint64 *count, guint factor) {
gchar suffix = 0;
if (*count >= factor) { *count /= factor; suffix = 'k';
if (*count >= factor) { *count /= factor; suffix = 'm';
if (*count >= factor) { *count /= factor; suffix = 'g';
if (*count >= factor) { *count /= factor; suffix = 't';
if (*count >= factor) { *count /= factor; suffix = 'p';
if (*count >= factor) { *count /= factor; suffix = 'e'; }
}
}
}
}
}
return suffix;
}
GString *counter_format2(guint64 count, counter_type t, gint accuracy) {
GString *str = g_string_sized_new(64);
if (t == COUNTER_TIME) {
if (accuracy && count > (3600*24)) {
g_string_append_printf(str, "%" G_GUINT64_FORMAT " day%s", count / (3600*24), (count / (3600*24)) > 1 ? "s":"");
count %= 3600*24;
accuracy--;
GString *counter_format(guint64 count, counter_type t, GString *dest) {
if (!dest)
dest = g_string_sized_new(10);
else
g_string_truncate(dest, 0);
switch (t) {
case COUNTER_TIME:
/* 123 days 12 hours 32 min 5 s */
if (count > (3600*24)) {
g_string_append_printf(dest, "%"G_GUINT64_FORMAT" days", count / (3600*24));
count %= (3600*24);
}
if (accuracy && count > 3600) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT " hour%s", count / 3600, (count / 3600) > 1 ? "s":"");
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT " hour%s", count / 3600, (count / 3600) > 1 ? "s":"");
if (count > 3600) {
g_string_append_printf(dest, "%s%"G_GUINT64_FORMAT" hours", dest->len ? " ":"", count / 3600);
count %= 3600;
accuracy--;
}
if (accuracy && count > 60) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT " min", count / 60);
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT " min", count / 60);
if (count > 60) {
g_string_append_printf(dest, "%s%"G_GUINT64_FORMAT" min", dest->len ? " ":"", count / 60);
count %= 60;
accuracy--;
}
if (accuracy && (count || !str->len)) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT " s", count);
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT " s", count);
}
} else if (t == COUNTER_UNITS) {
if (accuracy && count > 1000000) {
g_string_append_printf(str, "%" G_GUINT64_FORMAT " m", count / 1000000);
count %= 1000000;
accuracy--;
}
if (accuracy && count > 1000) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT " k", count / 1000);
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT " k", count / 1000);
count %= 1000;
accuracy--;
}
if (accuracy && (count || !str->len)) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT, count);
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT, count);
}
} else if (t == COUNTER_BYTES) {
if (accuracy && count > (1024*1024*1024*G_GUINT64_CONSTANT(1024))) {
g_string_append_printf(str, "%" G_GUINT64_FORMAT " TiB", count / (1024*1024*1024*G_GUINT64_CONSTANT(1024)));
count %= (1024*1024*1024*G_GUINT64_CONSTANT(1024));
accuracy--;
}
if (accuracy && count > (1024*1024*1024)) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT " GiB", count / (1024*1024*1024));
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT " GiB", count / (1024*1024*1024));
count %= (1024*1024*1024);
accuracy--;
if (count) {
g_string_append_printf(dest, "%s%"G_GUINT64_FORMAT" s", dest->len ? " ":"", count);
}
if (accuracy && count > (1024*1024)) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT " MiB", count / (1024*1024));
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT " MiB", count / (1024*1024));
count %= (1024*1024);
accuracy--;
}
if (accuracy && count > 1024) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT " KiB", count / 1024);
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT " KiB", count / 1024);
count %= 1024;
accuracy--;
}
if (accuracy && (count || !str->len)) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT " B", count);
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT " B", count);
}
} else if (t == COUNTER_BITS) {
if (accuracy && count > (1000*1000*1000)) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT " gb", count / (1000*1000*1000));
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT " gbit", count / (1000*1000*1000));
count %= (1024*1024*1024);
accuracy--;
}
if (accuracy && count > (1024*1024)) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT " mbit", count / (1024*1024));
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT " ", count / (1024*1024));
count %= (1024*1024);
accuracy--;
}
if (accuracy && count > 1024) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT " KiB", count / 1024);
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT " KiB", count / 1024);
count %= 1024;
accuracy--;
break;
case COUNTER_BYTES:
/* B KB MB GB TB PB */
if (count >> 50) {
/* PB */
g_string_append_printf(dest, "%"G_GUINT64_FORMAT".%02"G_GUINT64_FORMAT" PB", count >> 50, ((count >> 40) & 1023) / 10);
} else if (count >> 40) {
/* TB */
g_string_append_printf(dest, "%"G_GUINT64_FORMAT".%02"G_GUINT64_FORMAT" TB", count >> 40, ((count >> 30) & 1023) / 10);
} else if (count >> 30) {
/* GB */
g_string_append_printf(dest, "%"G_GUINT64_FORMAT".%02"G_GUINT64_FORMAT" GB", count >> 30, ((count >> 20) & 1023) / 10);
} else if (count >> 20) {
/* MB */
g_string_append_printf(dest, "%"G_GUINT64_FORMAT".%02"G_GUINT64_FORMAT" MB", count >> 20, ((count >> 10) & 1023) / 10);
} else if (count >> 10) {
/* KB */
g_string_append_printf(dest, "%"G_GUINT64_FORMAT".%02"G_GUINT64_FORMAT" KB", count >> 10, (count & 1023) / 10);
} else {
/* B */
g_string_append_printf(dest, "%"G_GUINT64_FORMAT" B", count);
}
if (accuracy && (count || !str->len)) {
if (str->len)
g_string_append_printf(str, " %" G_GUINT64_FORMAT " B", count);
else
g_string_append_printf(str, "%" G_GUINT64_FORMAT " B", count);
break;
case COUNTER_UNITS:
/* m k */
if (count < 1000) {
g_string_append_printf(dest, "%"G_GUINT64_FORMAT, count);
} else if (count < 1000*1000) {
g_string_append_printf(dest, "%"G_GUINT64_FORMAT".%02"G_GUINT64_FORMAT" k", count / 1000, (count % 1000) / 10);
} else {
g_string_append_printf(dest, "%"G_GUINT64_FORMAT".%02"G_GUINT64_FORMAT" m", count / (1000*1000), (count % (1000*1000)) / 10);
}
} else
g_string_append_len(str, CONST_STR_LEN("unknown counter type"));
break;
}
return str;
return dest;
}

Write Preview
Loading…
Cancel
Save