mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-11-04 10:18:44 +00: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>
100 lines
2.2 KiB
C
100 lines
2.2 KiB
C
/*
|
|
* q_fifo.c FIFO.
|
|
*
|
|
* 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: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
|
|
*
|
|
*/
|
|
|
|
#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: ... <[p|b]fifo | pfifo_head_drop> [ limit NUMBER ]\n");
|
|
}
|
|
|
|
static int fifo_parse_opt(struct qdisc_util *qu, int argc, char **argv,
|
|
struct nlmsghdr *n, const char *dev)
|
|
{
|
|
int ok = 0;
|
|
struct tc_fifo_qopt opt = {};
|
|
|
|
while (argc > 0) {
|
|
if (strcmp(*argv, "limit") == 0) {
|
|
NEXT_ARG();
|
|
if (get_size(&opt.limit, *argv)) {
|
|
fprintf(stderr, "%s: Illegal value for \"limit\": \"%s\"\n", qu->id, *argv);
|
|
return -1;
|
|
}
|
|
ok++;
|
|
} else if (strcmp(*argv, "help") == 0) {
|
|
explain();
|
|
return -1;
|
|
} else {
|
|
fprintf(stderr, "%s: unknown parameter \"%s\"\n", qu->id, *argv);
|
|
explain();
|
|
return -1;
|
|
}
|
|
argc--; argv++;
|
|
}
|
|
|
|
if (ok)
|
|
addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt));
|
|
return 0;
|
|
}
|
|
|
|
static int fifo_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
|
|
{
|
|
struct tc_fifo_qopt *qopt;
|
|
|
|
if (opt == NULL)
|
|
return 0;
|
|
|
|
if (RTA_PAYLOAD(opt) < sizeof(*qopt))
|
|
return -1;
|
|
qopt = RTA_DATA(opt);
|
|
if (strcmp(qu->id, "bfifo") == 0)
|
|
print_size(PRINT_ANY, "limit", "limit %s", qopt->limit);
|
|
else
|
|
print_uint(PRINT_ANY, "limit", "limit %up", qopt->limit);
|
|
return 0;
|
|
}
|
|
|
|
|
|
struct qdisc_util bfifo_qdisc_util = {
|
|
.id = "bfifo",
|
|
.parse_qopt = fifo_parse_opt,
|
|
.print_qopt = fifo_print_opt,
|
|
};
|
|
|
|
struct qdisc_util pfifo_qdisc_util = {
|
|
.id = "pfifo",
|
|
.parse_qopt = fifo_parse_opt,
|
|
.print_qopt = fifo_print_opt,
|
|
};
|
|
|
|
struct qdisc_util pfifo_head_drop_qdisc_util = {
|
|
.id = "pfifo_head_drop",
|
|
.parse_qopt = fifo_parse_opt,
|
|
.print_qopt = fifo_print_opt,
|
|
};
|
|
|
|
struct qdisc_util pfifo_fast_qdisc_util = {
|
|
.id = "pfifo_fast",
|
|
.print_qopt = prio_print_opt,
|
|
};
|