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

tc_util: break long lines 

Try to keep lines less than 100 characters or so.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2019-12-04 10:45:47 -08:00
parent 81b365eb50
commit 42060e8d35
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tc/tc_util.c
View File

@ -814,19 +814,23 @@ void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtat
if (tbs[TCA_STATS_PKT64]) if (tbs[TCA_STATS_PKT64])
packets64 = rta_getattr_u64(tbs[TCA_STATS_PKT64]); packets64 = rta_getattr_u64(tbs[TCA_STATS_PKT64]);
memcpy(&bs, RTA_DATA(tbs[TCA_STATS_BASIC]), MIN(RTA_PAYLOAD(tbs[TCA_STATS_BASIC]), sizeof(bs))); memcpy(&bs, RTA_DATA(tbs[TCA_STATS_BASIC]),
MIN(RTA_PAYLOAD(tbs[TCA_STATS_BASIC]), sizeof(bs)));
print_string(PRINT_FP, NULL, "%s", prefix); print_string(PRINT_FP, NULL, "%s", prefix);
print_lluint(PRINT_ANY, "bytes", "Sent %llu bytes", bs.bytes); print_lluint(PRINT_ANY, "bytes", "Sent %llu bytes", bs.bytes);
if (packets64) if (packets64)
print_lluint(PRINT_ANY, "packets", " %llu pkt", packets64); print_lluint(PRINT_ANY, "packets",
" %llu pkt", packets64);
else else
print_uint(PRINT_ANY, "packets", " %u pkt", bs.packets); print_uint(PRINT_ANY, "packets",
" %u pkt", bs.packets);
} }
if (tbs[TCA_STATS_QUEUE]) { if (tbs[TCA_STATS_QUEUE]) {
struct gnet_stats_queue q = {0}; struct gnet_stats_queue q = {0};
memcpy(&q, RTA_DATA(tbs[TCA_STATS_QUEUE]), MIN(RTA_PAYLOAD(tbs[TCA_STATS_QUEUE]), sizeof(q))); memcpy(&q, RTA_DATA(tbs[TCA_STATS_QUEUE]),
MIN(RTA_PAYLOAD(tbs[TCA_STATS_QUEUE]), sizeof(q)));
print_uint(PRINT_ANY, "drops", " (dropped %u", q.drops); print_uint(PRINT_ANY, "drops", " (dropped %u", q.drops);
print_uint(PRINT_ANY, "overlimits", ", overlimits %u", print_uint(PRINT_ANY, "overlimits", ", overlimits %u",
q.overlimits); q.overlimits);
@ -862,7 +866,8 @@ void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtat
if (tbs[TCA_STATS_QUEUE]) { if (tbs[TCA_STATS_QUEUE]) {
struct gnet_stats_queue q = {0}; struct gnet_stats_queue q = {0};
memcpy(&q, RTA_DATA(tbs[TCA_STATS_QUEUE]), MIN(RTA_PAYLOAD(tbs[TCA_STATS_QUEUE]), sizeof(q))); memcpy(&q, RTA_DATA(tbs[TCA_STATS_QUEUE]),
MIN(RTA_PAYLOAD(tbs[TCA_STATS_QUEUE]), sizeof(q)));
if (!tbs[TCA_STATS_RATE_EST]) if (!tbs[TCA_STATS_RATE_EST])
print_string(PRINT_FP, NULL, "\n", ""); print_string(PRINT_FP, NULL, "\n", "");
print_uint(PRINT_JSON, "backlog", NULL, q.backlog); print_uint(PRINT_JSON, "backlog", NULL, q.backlog);
@ -877,7 +882,8 @@ void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtat
*xstats = tbs[TCA_STATS_APP] ? : NULL; *xstats = tbs[TCA_STATS_APP] ? : NULL;
} }
void print_tcstats_attr(FILE *fp, struct rtattr *tb[], char *prefix, struct rtattr **xstats) void print_tcstats_attr(FILE *fp, struct rtattr *tb[], char *prefix,
struct rtattr **xstats)
{ {
SPRINT_BUF(b1); SPRINT_BUF(b1);
@ -892,25 +898,29 @@ void print_tcstats_attr(FILE *fp, struct rtattr *tb[], char *prefix, struct rtat
struct tc_stats st = {}; struct tc_stats st = {};
/* handle case where kernel returns more/less than we know about */ /* handle case where kernel returns more/less than we know about */
memcpy(&st, RTA_DATA(tb[TCA_STATS]), MIN(RTA_PAYLOAD(tb[TCA_STATS]), sizeof(st))); memcpy(&st, RTA_DATA(tb[TCA_STATS]),
MIN(RTA_PAYLOAD(tb[TCA_STATS]), sizeof(st)));
fprintf(fp, "%sSent %llu bytes %u pkts (dropped %u, overlimits %u) ", fprintf(fp,
prefix, (unsigned long long)st.bytes, st.packets, st.drops, "%sSent %llu bytes %u pkts (dropped %u, overlimits %u) ",
st.overlimits); prefix, (unsigned long long)st.bytes,
st.packets, st.drops, st.overlimits);
if (st.bps || st.pps || st.qlen || st.backlog) { if (st.bps || st.pps || st.qlen || st.backlog) {
fprintf(fp, "\n%s", prefix); fprintf(fp, "\n%s", prefix);
if (st.bps || st.pps) { if (st.bps || st.pps) {
fprintf(fp, "rate "); fprintf(fp, "rate ");
if (st.bps) if (st.bps)
fprintf(fp, "%s ", sprint_rate(st.bps, b1)); fprintf(fp, "%s ",
sprint_rate(st.bps, b1));
if (st.pps) if (st.pps)
fprintf(fp, "%upps ", st.pps); fprintf(fp, "%upps ", st.pps);
} }
if (st.qlen || st.backlog) { if (st.qlen || st.backlog) {
fprintf(fp, "backlog "); fprintf(fp, "backlog ");
if (st.backlog) if (st.backlog)
fprintf(fp, "%s ", sprint_size(st.backlog, b1)); fprintf(fp, "%s ",
sprint_size(st.backlog, b1));
if (st.qlen) if (st.qlen)
fprintf(fp, "%up ", st.qlen); fprintf(fp, "%up ", st.qlen);
} }