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

iplink_can: use PRINT_ANY to factorize code and fix signedness 

Current implementation heavily relies on some "if (is_json_context())"
switches to decide the context and then does some print_*(PRINT_JSON,
...) when in json context and some fprintf(...) else.

Furthermore, current implementation uses either print_int() or the
conversion specifier %d to print unsigned integers.

This patch factorizes each pairs of print_*(PRINT_JSON, ...) and
fprintf() into a single print_*(PRINT_ANY, ...) call. While doing this
replacement, it uses proper unsigned function print_uint() as well as
the conversion specifier %u when the parameter is an unsigned integer.

Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
Vincent Mailhol 2021-11-04 01:44:26 +09:00 committed by David Ahern
parent fd5e958c49
commit 67f3c7a5cc
1 changed files with 128 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

327
ip/iplink_can.c
View File

@ -275,11 +275,19 @@ static const char *can_state_names[CAN_STATE_MAX] = {
[CAN_STATE_SLEEPING] = "SLEEPING" [CAN_STATE_SLEEPING] = "SLEEPING"
}; };
static void can_print_json_timing_min_max(const char *attr, int min, int max) static void can_print_nl_indent(void)
{ {
open_json_object(attr); print_nl();
print_int(PRINT_JSON, "min", NULL, min); print_string(PRINT_FP, NULL, "%s", "\t ");
print_int(PRINT_JSON, "max", NULL, max); }
static void can_print_timing_min_max(const char *json_attr, const char *fp_attr,
int min, int max)
{
print_null(PRINT_FP, NULL, fp_attr, NULL);
open_json_object(json_attr);
print_uint(PRINT_ANY, "min", " %d", min);
print_uint(PRINT_ANY, "max", "..%d", max);
close_json_object(); close_json_object();
} }
@ -305,56 +313,38 @@ static void can_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
struct can_berr_counter *bc = struct can_berr_counter *bc =
RTA_DATA(tb[IFLA_CAN_BERR_COUNTER]); RTA_DATA(tb[IFLA_CAN_BERR_COUNTER]);
if (is_json_context()) { open_json_object("berr_counter");
open_json_object("berr_counter"); print_uint(PRINT_ANY, "tx", "(berr-counter tx %u", bc->txerr);
print_int(PRINT_JSON, "tx", NULL, bc->txerr); print_uint(PRINT_ANY, "rx", " rx %u) ", bc->rxerr);
print_int(PRINT_JSON, "rx", NULL, bc->rxerr); close_json_object();
close_json_object();
} else {
fprintf(f, "(berr-counter tx %d rx %d) ",
bc->txerr, bc->rxerr);
}
} }
if (tb[IFLA_CAN_RESTART_MS]) { if (tb[IFLA_CAN_RESTART_MS]) {
__u32 *restart_ms = RTA_DATA(tb[IFLA_CAN_RESTART_MS]); __u32 *restart_ms = RTA_DATA(tb[IFLA_CAN_RESTART_MS]);
print_int(PRINT_ANY, print_uint(PRINT_ANY, "restart_ms", "restart-ms %u ",
"restart_ms", *restart_ms);
"restart-ms %d ",
*restart_ms);
} }
/* bittiming is irrelevant if fixed bitrate is defined */ /* bittiming is irrelevant if fixed bitrate is defined */
if (tb[IFLA_CAN_BITTIMING] && !tb[IFLA_CAN_BITRATE_CONST]) { if (tb[IFLA_CAN_BITTIMING] && !tb[IFLA_CAN_BITRATE_CONST]) {
struct can_bittiming *bt = RTA_DATA(tb[IFLA_CAN_BITTIMING]); struct can_bittiming *bt = RTA_DATA(tb[IFLA_CAN_BITTIMING]);
char sp[6];
if (is_json_context()) { open_json_object("bittiming");
json_writer_t *jw; can_print_nl_indent();
print_uint(PRINT_ANY, "bitrate", " bitrate %u", bt->bitrate);
open_json_object("bittiming"); snprintf(sp, sizeof(sp), "%.3f", bt->sample_point / 1000.);
print_int(PRINT_ANY, "bitrate", NULL, bt->bitrate); print_string(PRINT_ANY, "sample_point", " sample-point %s", sp);
jw = get_json_writer(); can_print_nl_indent();
jsonw_name(jw, "sample_point"); print_uint(PRINT_ANY, "tq", " tq %u", bt->tq);
jsonw_printf(jw, "%.3f", print_uint(PRINT_ANY, "prop_seg", " prop-seg %u", bt->prop_seg);
(float) bt->sample_point / 1000); print_uint(PRINT_ANY, "phase_seg1", " phase-seg1 %u",
print_int(PRINT_ANY, "tq", NULL, bt->tq); bt->phase_seg1);
print_int(PRINT_ANY, "prop_seg", NULL, bt->prop_seg); print_uint(PRINT_ANY, "phase_seg2", " phase-seg2 %u",
print_int(PRINT_ANY, "phase_seg1", bt->phase_seg2);
NULL, bt->phase_seg1); print_uint(PRINT_ANY, "sjw", " sjw %u", bt->sjw);
print_int(PRINT_ANY, "phase_seg2", close_json_object();
NULL, bt->phase_seg2);
print_int(PRINT_ANY, "sjw", NULL, bt->sjw);
close_json_object();
} else {
fprintf(f, "\n bitrate %d sample-point %.3f ",
bt->bitrate, (float) bt->sample_point / 1000.);
fprintf(f,
"\n tq %d prop-seg %d phase-seg1 %d phase-seg2 %d sjw %d",
bt->tq, bt->prop_seg,
bt->phase_seg1, bt->phase_seg2,
bt->sjw);
}
} }
/* bittiming const is irrelevant if fixed bitrate is defined */ /* bittiming const is irrelevant if fixed bitrate is defined */
@ -362,28 +352,18 @@ static void can_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
struct can_bittiming_const *btc = struct can_bittiming_const *btc =
RTA_DATA(tb[IFLA_CAN_BITTIMING_CONST]); RTA_DATA(tb[IFLA_CAN_BITTIMING_CONST]);
if (is_json_context()) { open_json_object("bittiming_const");
open_json_object("bittiming_const"); can_print_nl_indent();
print_string(PRINT_JSON, "name", NULL, btc->name); print_string(PRINT_ANY, "name", " %s:", btc->name);
can_print_json_timing_min_max("tseg1", can_print_timing_min_max("tseg1", " tseg1",
btc->tseg1_min, btc->tseg1_min, btc->tseg1_max);
btc->tseg1_max); can_print_timing_min_max("tseg2", " tseg2",
can_print_json_timing_min_max("tseg2", btc->tseg2_min, btc->tseg2_max);
btc->tseg2_min, can_print_timing_min_max("sjw", " sjw", 1, btc->sjw_max);
btc->tseg2_max); can_print_timing_min_max("brp", " brp",
can_print_json_timing_min_max("sjw", 1, btc->sjw_max); btc->brp_min, btc->brp_max);
can_print_json_timing_min_max("brp", print_uint(PRINT_ANY, "brp_inc", " brp_inc %u", btc->brp_inc);
btc->brp_min, close_json_object();
btc->brp_max);
print_int(PRINT_JSON, "brp_inc", NULL, btc->brp_inc);
close_json_object();
} else {
fprintf(f, "\n %s: tseg1 %d..%d tseg2 %d..%d "
"sjw 1..%d brp %d..%d brp-inc %d",
btc->name, btc->tseg1_min, btc->tseg1_max,
btc->tseg2_min, btc->tseg2_max, btc->sjw_max,
btc->brp_min, btc->brp_max, btc->brp_inc);
}
} }
if (tb[IFLA_CAN_BITRATE_CONST]) { if (tb[IFLA_CAN_BITRATE_CONST]) {
@ -399,64 +379,47 @@ static void can_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
bitrate = bt->bitrate; bitrate = bt->bitrate;
} }
if (is_json_context()) { can_print_nl_indent();
print_uint(PRINT_JSON, print_uint(PRINT_ANY, "bittiming_bitrate", " bitrate %u",
"bittiming_bitrate", bitrate);
NULL, bitrate); can_print_nl_indent();
open_json_array(PRINT_JSON, "bitrate_const"); open_json_array(PRINT_ANY, is_json_context() ?
for (i = 0; i < bitrate_cnt; ++i) "bitrate_const" : " [");
print_uint(PRINT_JSON, NULL, NULL, for (i = 0; i < bitrate_cnt; ++i) {
bitrate_const[i]); /* This will keep lines below 80 signs */
close_json_array(PRINT_JSON, NULL); if (!(i % 6) && i) {
} else { can_print_nl_indent();
fprintf(f, "\n bitrate %u", bitrate); print_string(PRINT_FP, NULL, "%s", " ");
fprintf(f, "\n [");
for (i = 0; i < bitrate_cnt - 1; ++i) {
/* This will keep lines below 80 signs */
if (!(i % 6) && i)
fprintf(f, "\n ");
fprintf(f, "%8u, ", bitrate_const[i]);
} }
print_uint(PRINT_ANY, NULL,
if (!(i % 6) && i) i < bitrate_cnt - 1 ? "%8u, " : "%8u",
fprintf(f, "\n "); bitrate_const[i]);
fprintf(f, "%8u ]", bitrate_const[i]);
} }
close_json_array(PRINT_JSON, " ]");
} }
/* data bittiming is irrelevant if fixed bitrate is defined */ /* data bittiming is irrelevant if fixed bitrate is defined */
if (tb[IFLA_CAN_DATA_BITTIMING] && !tb[IFLA_CAN_DATA_BITRATE_CONST]) { if (tb[IFLA_CAN_DATA_BITTIMING] && !tb[IFLA_CAN_DATA_BITRATE_CONST]) {
struct can_bittiming *dbt = struct can_bittiming *dbt =
RTA_DATA(tb[IFLA_CAN_DATA_BITTIMING]); RTA_DATA(tb[IFLA_CAN_DATA_BITTIMING]);
char dsp[6];
if (is_json_context()) { open_json_object("data_bittiming");
json_writer_t *jw; can_print_nl_indent();
print_uint(PRINT_ANY, "bitrate", " dbitrate %u", dbt->bitrate);
open_json_object("data_bittiming"); snprintf(dsp, sizeof(dsp), "%.3f", dbt->sample_point / 1000.);
print_int(PRINT_JSON, "bitrate", NULL, dbt->bitrate); print_string(PRINT_ANY, "sample_point", " dsample-point %s",
jw = get_json_writer(); dsp);
jsonw_name(jw, "sample_point"); can_print_nl_indent();
jsonw_printf(jw, "%.3f", print_uint(PRINT_ANY, "tq", " dtq %u", dbt->tq);
(float) dbt->sample_point / 1000.); print_uint(PRINT_ANY, "prop_seg", " dprop-seg %u",
print_int(PRINT_JSON, "tq", NULL, dbt->tq); dbt->prop_seg);
print_int(PRINT_JSON, "prop_seg", NULL, dbt->prop_seg); print_uint(PRINT_ANY, "phase_seg1", " dphase-seg1 %u",
print_int(PRINT_JSON, "phase_seg1", dbt->phase_seg1);
NULL, dbt->phase_seg1); print_uint(PRINT_ANY, "phase_seg2", " dphase-seg2 %u",
print_int(PRINT_JSON, "phase_seg2", dbt->phase_seg2);
NULL, dbt->phase_seg2); print_uint(PRINT_ANY, "sjw", " dsjw %u", dbt->sjw);
print_int(PRINT_JSON, "sjw", NULL, dbt->sjw); close_json_object();
close_json_object();
} else {
fprintf(f, "\n dbitrate %d dsample-point %.3f ",
dbt->bitrate,
(float) dbt->sample_point / 1000.);
fprintf(f, "\n dtq %d dprop-seg %d dphase-seg1 %d "
"dphase-seg2 %d dsjw %d",
dbt->tq, dbt->prop_seg, dbt->phase_seg1,
dbt->phase_seg2, dbt->sjw);
}
} }
/* data bittiming const is irrelevant if fixed bitrate is defined */ /* data bittiming const is irrelevant if fixed bitrate is defined */
@ -465,29 +428,18 @@ static void can_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
struct can_bittiming_const *dbtc = struct can_bittiming_const *dbtc =
RTA_DATA(tb[IFLA_CAN_DATA_BITTIMING_CONST]); RTA_DATA(tb[IFLA_CAN_DATA_BITTIMING_CONST]);
if (is_json_context()) { open_json_object("data_bittiming_const");
open_json_object("data_bittiming_const"); can_print_nl_indent();
print_string(PRINT_JSON, "name", NULL, dbtc->name); print_string(PRINT_ANY, "name", " %s:", dbtc->name);
can_print_json_timing_min_max("tseg1", can_print_timing_min_max("tseg1", " dtseg1",
dbtc->tseg1_min, dbtc->tseg1_min, dbtc->tseg1_max);
dbtc->tseg1_max); can_print_timing_min_max("tseg2", " dtseg2",
can_print_json_timing_min_max("tseg2", dbtc->tseg2_min, dbtc->tseg2_max);
dbtc->tseg2_min, can_print_timing_min_max("sjw", " dsjw", 1, dbtc->sjw_max);
dbtc->tseg2_max); can_print_timing_min_max("brp", " dbrp",
can_print_json_timing_min_max("sjw", 1, dbtc->sjw_max); dbtc->brp_min, dbtc->brp_max);
can_print_json_timing_min_max("brp", print_uint(PRINT_ANY, "brp_inc", " dbrp_inc %u", dbtc->brp_inc);
dbtc->brp_min, close_json_object();
dbtc->brp_max);
print_int(PRINT_JSON, "brp_inc", NULL, dbtc->brp_inc);
close_json_object();
} else {
fprintf(f, "\n %s: dtseg1 %d..%d dtseg2 %d..%d "
"dsjw 1..%d dbrp %d..%d dbrp-inc %d",
dbtc->name, dbtc->tseg1_min, dbtc->tseg1_max,
dbtc->tseg2_min, dbtc->tseg2_max, dbtc->sjw_max,
dbtc->brp_min, dbtc->brp_max, dbtc->brp_inc);
}
} }
if (tb[IFLA_CAN_DATA_BITRATE_CONST]) { if (tb[IFLA_CAN_DATA_BITRATE_CONST]) {
@ -505,30 +457,23 @@ static void can_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
dbitrate = dbt->bitrate; dbitrate = dbt->bitrate;
} }
if (is_json_context()) { can_print_nl_indent();
print_uint(PRINT_JSON, "data_bittiming_bitrate", print_uint(PRINT_ANY, "data_bittiming_bitrate", " dbitrate %u",
NULL, dbitrate); dbitrate);
open_json_array(PRINT_JSON, "data_bitrate_const"); can_print_nl_indent();
for (i = 0; i < dbitrate_cnt; ++i) open_json_array(PRINT_ANY, is_json_context() ?
print_uint(PRINT_JSON, NULL, NULL, "data_bitrate_const" : " [");
dbitrate_const[i]); for (i = 0; i < dbitrate_cnt; ++i) {
close_json_array(PRINT_JSON, NULL); /* This will keep lines below 80 signs */
} else { if (!(i % 6) && i) {
fprintf(f, "\n dbitrate %u", dbitrate); can_print_nl_indent();
fprintf(f, "\n ["); print_string(PRINT_FP, NULL, "%s", " ");
for (i = 0; i < dbitrate_cnt - 1; ++i) {
/* This will keep lines below 80 signs */
if (!(i % 6) && i)
fprintf(f, "\n ");
fprintf(f, "%8u, ", dbitrate_const[i]);
} }
print_uint(PRINT_ANY, NULL,
if (!(i % 6) && i) i < dbitrate_cnt - 1 ? "%8u, " : "%8u",
fprintf(f, "\n "); dbitrate_const[i]);
fprintf(f, "%8u ]", dbitrate_const[i]);
} }
close_json_array(PRINT_JSON, " ]");
} }
if (tb[IFLA_CAN_TERMINATION_CONST] && tb[IFLA_CAN_TERMINATION]) { if (tb[IFLA_CAN_TERMINATION_CONST] && tb[IFLA_CAN_TERMINATION]) {
@ -538,29 +483,21 @@ static void can_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
sizeof(*trm_const); sizeof(*trm_const);
int i; int i;
if (is_json_context()) { can_print_nl_indent();
print_hu(PRINT_JSON, "termination", NULL, *trm); print_hu(PRINT_ANY, "termination", " termination %hu [ ", *trm);
open_json_array(PRINT_JSON, "termination_const"); open_json_array(PRINT_JSON, "termination_const");
for (i = 0; i < trm_cnt; ++i) for (i = 0; i < trm_cnt; ++i)
print_hu(PRINT_JSON, NULL, NULL, trm_const[i]); print_hu(PRINT_ANY, NULL,
close_json_array(PRINT_JSON, NULL); i < trm_cnt - 1 ? "%hu, " : "%hu",
} else { trm_const[i]);
fprintf(f, "\n termination %hu [ ", *trm); close_json_array(PRINT_JSON, " ]");
for (i = 0; i < trm_cnt - 1; ++i)
fprintf(f, "%hu, ", trm_const[i]);
fprintf(f, "%hu ]", trm_const[i]);
}
} }
if (tb[IFLA_CAN_CLOCK]) { if (tb[IFLA_CAN_CLOCK]) {
struct can_clock *clock = RTA_DATA(tb[IFLA_CAN_CLOCK]); struct can_clock *clock = RTA_DATA(tb[IFLA_CAN_CLOCK]);
print_int(PRINT_ANY, can_print_nl_indent();
"clock", print_uint(PRINT_ANY, "clock", " clock %u ", clock->freq);
"\n clock %d ",
clock->freq);
} }
} }
@ -573,31 +510,23 @@ static void can_print_xstats(struct link_util *lu,
if (xstats && RTA_PAYLOAD(xstats) == sizeof(*stats)) { if (xstats && RTA_PAYLOAD(xstats) == sizeof(*stats)) {
stats = RTA_DATA(xstats); stats = RTA_DATA(xstats);
if (is_json_context()) { can_print_nl_indent();
print_int(PRINT_JSON, "restarts", print_string(PRINT_FP, NULL, "%s",
NULL, stats->restarts); " re-started bus-errors arbit-lost error-warn error-pass bus-off");
print_int(PRINT_JSON, "bus_error", can_print_nl_indent();
NULL, stats->bus_error); print_uint(PRINT_ANY, "restarts", " %-10u", stats->restarts);
print_int(PRINT_JSON, "arbitration_lost", print_uint(PRINT_ANY, "bus_error", " %-10u", stats->bus_error);
NULL, stats->arbitration_lost); print_uint(PRINT_ANY, "arbitration_lost", " %-10u",
print_int(PRINT_JSON, "error_warning", stats->arbitration_lost);
NULL, stats->error_warning); print_uint(PRINT_ANY, "error_warning", " %-10u",
print_int(PRINT_JSON, "error_passive", stats->error_warning);
NULL, stats->error_passive); print_uint(PRINT_ANY, "error_passive", " %-10u",
print_int(PRINT_JSON, "bus_off", NULL, stats->bus_off); stats->error_passive);
} else { print_uint(PRINT_ANY, "bus_off", " %-10u", stats->bus_off);
fprintf(f, "\n re-started bus-errors arbit-lost "
"error-warn error-pass bus-off");
fprintf(f, "\n %-10d %-10d %-10d %-10d %-10d %-10d",
stats->restarts, stats->bus_error,
stats->arbitration_lost, stats->error_warning,
stats->error_passive, stats->bus_off);
}
} }
} }
static void can_print_help(struct link_util *lu, int argc, char **argv, static void can_print_help(struct link_util *lu, int argc, char **argv, FILE *f)
FILE *f)
{ {
print_usage(f); print_usage(f);
} }