mirror of
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git
synced 2024-11-15 05:55:11 +08:00
adbe5de966
When displaying sizes of various sorts, tc commonly uses the function sprint_size() to format the size into a buffer as a human-readable string. This string is then displayed either using print_string(), or in some code even fprintf(). As a result, a typical sequence of code when formatting a size is something like the following: SPRINT_BUF(b); print_uint(PRINT_JSON, "foo", NULL, foo); print_string(PRINT_FP, NULL, "foo %s ", sprint_size(foo, b)); For a concept as broadly useful as size, it would be better to have a dedicated function in json_print. To that end, move sprint_size() from tc_util to json_print. Add helpers print_size() and print_color_size() that wrap arount sprint_size() and provide the JSON dispatch as appropriate. Since print_size() should be the preferred interface, convert vast majority of uses of sprint_size() to print_size(). Two notable exceptions are: - q_tbf, which does not show the size as such, but uses the string "$human_readable_size/$cell_size" even in JSON. There is simply no way to have print_size() emit the same text, because print_size() in JSON mode should of course just use the raw number, without human-readable frills. - q_cake, which relies on the existence of sprint_size() in its macro-based formatting helpers. There might be ways to convert this particular case, but given q_tbf simply cannot be converted, leave it as is. Signed-off-by: Petr Machata <me@pmachata.org> Signed-off-by: David Ahern <dsahern@gmail.com>
120 lines
2.4 KiB
C
120 lines
2.4 KiB
C
/*
|
|
* q_drr.c DRR.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*
|
|
* Authors: Patrick McHardy <kaber@trash.net>
|
|
*
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <string.h>
|
|
|
|
#include "utils.h"
|
|
#include "tc_util.h"
|
|
|
|
static void explain(void)
|
|
{
|
|
fprintf(stderr, "Usage: ... drr\n");
|
|
}
|
|
|
|
static void explain2(void)
|
|
{
|
|
fprintf(stderr, "Usage: ... drr quantum SIZE\n");
|
|
}
|
|
|
|
|
|
static int drr_parse_opt(struct qdisc_util *qu, int argc, char **argv,
|
|
struct nlmsghdr *n, const char *dev)
|
|
{
|
|
while (argc) {
|
|
if (strcmp(*argv, "help") == 0) {
|
|
explain();
|
|
return -1;
|
|
} else {
|
|
fprintf(stderr, "What is \"%s\"?\n", *argv);
|
|
explain();
|
|
return -1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int drr_parse_class_opt(struct qdisc_util *qu, int argc, char **argv,
|
|
struct nlmsghdr *n, const char *dev)
|
|
{
|
|
struct rtattr *tail;
|
|
__u32 tmp;
|
|
|
|
tail = addattr_nest(n, 1024, TCA_OPTIONS);
|
|
|
|
while (argc > 0) {
|
|
if (strcmp(*argv, "quantum") == 0) {
|
|
NEXT_ARG();
|
|
if (get_size(&tmp, *argv)) {
|
|
fprintf(stderr, "Illegal \"quantum\"\n");
|
|
return -1;
|
|
}
|
|
addattr_l(n, 1024, TCA_DRR_QUANTUM, &tmp, sizeof(tmp));
|
|
} else if (strcmp(*argv, "help") == 0) {
|
|
explain2();
|
|
return -1;
|
|
} else {
|
|
fprintf(stderr, "What is \"%s\"?\n", *argv);
|
|
explain2();
|
|
return -1;
|
|
}
|
|
argc--; argv++;
|
|
}
|
|
|
|
addattr_nest_end(n, tail);
|
|
return 0;
|
|
}
|
|
|
|
static int drr_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
|
|
{
|
|
struct rtattr *tb[TCA_DRR_MAX + 1];
|
|
|
|
if (opt == NULL)
|
|
return 0;
|
|
|
|
parse_rtattr_nested(tb, TCA_DRR_MAX, opt);
|
|
|
|
if (tb[TCA_DRR_QUANTUM])
|
|
print_size(PRINT_FP, NULL, "quantum %s ",
|
|
rta_getattr_u32(tb[TCA_DRR_QUANTUM]));
|
|
return 0;
|
|
}
|
|
|
|
static int drr_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstats)
|
|
{
|
|
struct tc_drr_stats *x;
|
|
|
|
if (xstats == NULL)
|
|
return 0;
|
|
if (RTA_PAYLOAD(xstats) < sizeof(*x))
|
|
return -1;
|
|
x = RTA_DATA(xstats);
|
|
|
|
print_size(PRINT_FP, NULL, " deficit %s ", x->deficit);
|
|
return 0;
|
|
}
|
|
|
|
struct qdisc_util drr_qdisc_util = {
|
|
.id = "drr",
|
|
.parse_qopt = drr_parse_opt,
|
|
.print_qopt = drr_print_opt,
|
|
.print_xstats = drr_print_xstats,
|
|
.parse_copt = drr_parse_class_opt,
|
|
.print_copt = drr_print_opt,
|
|
};
|