matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tc: fq_codel: fix missing statistic in JSON output 

Print JSON object even if tc_fq_codel_xstats->class_stats.drop_next
is negative.

Cc: Toke Høiland-Jørgensen <toke@toke.dk>
Fixes: 997f2dc193 ("tc: Add JSON output of fq_codel stats")
Signed-off-by: Leslie Monis <lesliemonis@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Leslie Monis 2019-12-26 00:34:18 +05:30 committed by Stephen Hemminger
parent 669314e817
commit e819d3a03d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tc/q_fq_codel.c
View File

@ -275,12 +275,12 @@ static int fq_codel_print_xstats(struct qdisc_util *qu, FILE *f,
sprint_time(st->class_stats.ldelay, b1)); sprint_time(st->class_stats.ldelay, b1));
if (st->class_stats.dropping) { if (st->class_stats.dropping) {
print_bool(PRINT_ANY, "dropping", " dropping", true); print_bool(PRINT_ANY, "dropping", " dropping", true);
print_int(PRINT_JSON, "drop_next", NULL,
st->class_stats.drop_next);
if (st->class_stats.drop_next < 0) if (st->class_stats.drop_next < 0)
print_string(PRINT_FP, NULL, " 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 {
print_uint(PRINT_JSON, "drop_next", NULL,
st->class_stats.drop_next);
print_string(PRINT_FP, NULL, " 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));
} }