proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-08-15 14:57:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tc: Add JSON output of fq_codel stats

Browse Source 
Enable proper JSON output support for fq_codel in `tc -s qdisc` output.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Toke Høiland-Jørgensen 2018-03-08 23:31:37 +01:00 committed by David Ahern
parent d7d044ff53
commit 997f2dc193
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tc/q_fq_codel.c
View File

@ -239,37 +239,52 @@ static int fq_codel_print_xstats(struct qdisc_util *qu, FILE *f,
st = &_st; st = &_st;
} }
if (st->type == TCA_FQ_CODEL_XSTATS_QDISC) { if (st->type == TCA_FQ_CODEL_XSTATS_QDISC) {
fprintf(f, " maxpacket %u drop_overlimit %u new_flow_count %u ecn_mark %u", print_uint(PRINT_ANY, "maxpacket", " maxpacket %u",
st->qdisc_stats.maxpacket, st->qdisc_stats.maxpacket);
st->qdisc_stats.drop_overlimit, print_uint(PRINT_ANY, "drop_overlimit", " drop_overlimit %u",
st->qdisc_stats.new_flow_count, st->qdisc_stats.drop_overlimit);
print_uint(PRINT_ANY, "new_flow_count", " new_flow_count %u",
st->qdisc_stats.new_flow_count);
print_uint(PRINT_ANY, "ecn_mark", " ecn_mark %u",
st->qdisc_stats.ecn_mark); st->qdisc_stats.ecn_mark);
if (st->qdisc_stats.ce_mark) if (st->qdisc_stats.ce_mark)
fprintf(f, " ce_mark %u", st->qdisc_stats.ce_mark); print_uint(PRINT_ANY, "ce_mark", " ce_mark %u",
st->qdisc_stats.ce_mark);
if (st->qdisc_stats.memory_usage) if (st->qdisc_stats.memory_usage)
fprintf(f, " memory_used %u", st->qdisc_stats.memory_usage); print_uint(PRINT_ANY, "memory_used", " memory_used %u",
st->qdisc_stats.memory_usage);
if (st->qdisc_stats.drop_overmemory) if (st->qdisc_stats.drop_overmemory)
fprintf(f, " drop_overmemory %u", st->qdisc_stats.drop_overmemory); print_uint(PRINT_ANY, "drop_overmemory", " drop_overmemory %u",
fprintf(f, "\n new_flows_len %u old_flows_len %u", st->qdisc_stats.drop_overmemory);
st->qdisc_stats.new_flows_len, print_uint(PRINT_ANY, "new_flows_len", "\n new_flows_len %u",
st->qdisc_stats.new_flows_len);
print_uint(PRINT_ANY, "old_flows_len", " old_flows_len %u",
st->qdisc_stats.old_flows_len); st->qdisc_stats.old_flows_len);
} }
if (st->type == TCA_FQ_CODEL_XSTATS_CLASS) { if (st->type == TCA_FQ_CODEL_XSTATS_CLASS) {
fprintf(f, " deficit %d count %u lastcount %u ldelay %s", print_uint(PRINT_ANY, "deficit", " deficit %u",
st->class_stats.deficit, st->class_stats.deficit);
st->class_stats.count, print_uint(PRINT_ANY, "count", " count %u",
st->class_stats.lastcount, st->class_stats.count);
print_uint(PRINT_ANY, "lastcount", " lastcount %u",
st->class_stats.lastcount);
print_uint(PRINT_JSON, "ldelay", NULL,
st->class_stats.ldelay);
print_string(PRINT_FP, NULL, " ldelay %s",
sprint_time(st->class_stats.ldelay, b1)); sprint_time(st->class_stats.ldelay, b1));
if (st->class_stats.dropping) { if (st->class_stats.dropping) {
fprintf(f, " dropping"); print_bool(PRINT_ANY, "dropping", " dropping", true);
if (st->class_stats.drop_next < 0) if (st->class_stats.drop_next < 0)
fprintf(f, " drop_next -%s", print_string(PRINT_FP, NULL, " drop_next -%s",
sprint_time(-st->class_stats.drop_next, b1)); sprint_time(-st->class_stats.drop_next, b1));
else else {
fprintf(f, " drop_next %s", print_uint(PRINT_JSON, "drop_next", NULL,
st->class_stats.drop_next);
print_string(PRINT_FP, NULL, " drop_next %s",
sprint_time(st->class_stats.drop_next, b1)); sprint_time(st->class_stats.drop_next, b1));
} }
} }
}
return 0; return 0;
} }