[mod_status] Add output for peak values

personal/stbuehler/wip
Thomas Porzelt 13 years ago
parent 6bf284b754
commit d1095e5943

@ -429,7 +429,8 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0),
G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0),
G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0),
0, 0, G_GUINT64_CONSTANT(0), 0, 0
0, 0, {G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0), G_GUINT64_CONSTANT(0)},
G_GUINT64_CONSTANT(0), 0, 0
};
/* clear context so it doesn't get cleaned up anymore */
@ -460,6 +461,11 @@ static void status_collect_cb(gpointer cbdata, gpointer fdata, GPtrArray *result
totals.active_cons_cum += sd->stats.active_cons_cum;
totals.active_cons_5s += sd->stats.active_cons_5s;
totals.peak.bytes_out += sd->stats.peak.bytes_out;
totals.peak.bytes_in += sd->stats.peak.bytes_in;
totals.peak.requests += sd->stats.peak.requests;
totals.peak.active_cons += sd->stats.peak.active_cons;
connection_count[0] += sd->connection_count[0];
connection_count[1] += sd->connection_count[1];
connection_count[2] += sd->connection_count[2];
@ -644,6 +650,38 @@ static GString *status_info_full(liVRequest *vr, liPlugin *p, gboolean short_inf
);
g_string_append_len(html, CONST_STR_LEN(" </table>\n"));
/* worker information, peak values */
g_string_append_len(html, CONST_STR_LEN("<div class=\"title\"><strong>Peak stats</strong></div>\n"));
g_string_append_len(html, CONST_STR_LEN(html_worker_th_avg));
for (i = 0; i < result->len; i++) {
mod_status_wrk_data *sd = g_ptr_array_index(result, i);
li_counter_format(sd->stats.peak.requests, COUNTER_UNITS, count_req);
li_counter_format(sd->stats.peak.bytes_in, COUNTER_BYTES, count_bin);
li_counter_format(sd->stats.peak.bytes_out, 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,
count_bin->str,
count_bout->str,
sd->stats.peak.active_cons
);
}
li_counter_format(totals->peak.requests, COUNTER_UNITS, count_req);
li_counter_format(totals->peak.bytes_in, COUNTER_BYTES, count_bin);
li_counter_format(totals->peak.bytes_out, COUNTER_BYTES, count_bout);
g_string_append_printf(html, html_worker_row_avg, "totals", "Total",
count_req->str,
count_bin->str,
count_bout->str,
totals->peak.active_cons
);
g_string_append_len(html, CONST_STR_LEN(" </table>\n"));
/* connection counts */
g_string_append_len(html, CONST_STR_LEN("<div class=\"title\"><strong>Active connections</strong> (states, sum)</div>\n"));
g_string_append_printf(html, html_connections_sum, connection_count[2],

Loading…
Cancel
Save