proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-05 20:48:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tc: gred: separate out stats printing

Browse Source 
Printing GRED statistics is long and deserves a function on its own.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Jakub Kicinski 2018-11-19 15:03:32 -08:00 committed by David Ahern
parent 6475e6a580
commit c3e1cd28c1
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
tc/q_gred.c
View File

@ -265,6 +265,38 @@ static int gred_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct n
return 0; return 0;
} }
static void gred_print_stats(struct tc_gred_qopt *qopt)
{
SPRINT_BUF(b1);
if (!is_json_context())
printf("\n Queue size: ");
print_uint(PRINT_JSON, "qave", NULL, qopt->qave);
print_string(PRINT_FP, NULL, "average %s ",
sprint_size(qopt->qave, b1));
print_uint(PRINT_JSON, "backlog", NULL, qopt->backlog);
print_string(PRINT_FP, NULL, "current %s ",
sprint_size(qopt->backlog, b1));
if (!is_json_context())
printf("\n Dropped packets: ");
print_uint(PRINT_ANY, "forced_drop", "forced %u ", qopt->forced);
print_uint(PRINT_ANY, "prob_drop", "early %u ", qopt->early);
print_uint(PRINT_ANY, "pdrop", "pdrop %u ", qopt->pdrop);
print_uint(PRINT_ANY, "other", "other %u ", qopt->other);
if (!is_json_context())
printf("\n Total packets: ");
print_uint(PRINT_ANY, "packets", "%u ", qopt->packets);
print_uint(PRINT_JSON, "bytes", NULL, qopt->bytesin);
print_string(PRINT_FP, NULL, "(%s) ", sprint_size(qopt->bytesin, b1));
}
static int gred_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) static int gred_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
{ {
struct rtattr *tb[TCA_GRED_MAX + 1]; struct rtattr *tb[TCA_GRED_MAX + 1];
@ -348,39 +380,8 @@ static int gred_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
print_uint(PRINT_ANY, "Scell_log", "Scell_log %u ", print_uint(PRINT_ANY, "Scell_log", "Scell_log %u ",
qopt->Scell_log); qopt->Scell_log);
} }
if (show_stats) { if (show_stats)
if (!is_json_context()) gred_print_stats(qopt);
printf("\n Queue size: ");
print_uint(PRINT_JSON, "qave", NULL, qopt->qave);
print_string(PRINT_FP, NULL, "average %s ",
sprint_size(qopt->qave, b1));
print_uint(PRINT_JSON, "backlog", NULL, qopt->backlog);
print_string(PRINT_FP, NULL, "current %s ",
sprint_size(qopt->backlog, b1));
if (!is_json_context())
printf("\n Dropped packets: ");
print_uint(PRINT_ANY, "forced_drop", "forced %u ",
qopt->forced);
print_uint(PRINT_ANY, "prob_drop", "early %u ",
qopt->early);
print_uint(PRINT_ANY, "pdrop", "pdrop %u ",
qopt->pdrop);
print_uint(PRINT_ANY, "other", "other %u ",
qopt->other);
if (!is_json_context())
printf("\n Total packets: ");
print_uint(PRINT_ANY, "packets", "%u ", qopt->packets);
print_uint(PRINT_JSON, "bytes", NULL, qopt->bytesin);
print_string(PRINT_FP, NULL, "(%s) ",
sprint_size(qopt->bytesin, b1));
}
close_json_object(); close_json_object();
} }
close_json_array(PRINT_JSON, "vqs"); close_json_array(PRINT_JSON, "vqs");