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

devlink: Replace pr_out_str wrapper function with common function 

Replace calls for pr_out_str() and pr_out_str_value() with direct calls to
common json_print library functions.

Signed-off-by: Ron Diskin <rondi@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Ron Diskin 2020-01-23 12:32:29 +02:00 committed by Stephen Hemminger
parent b20555e402
commit 3666eb0eb6
1 changed files with 166 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

292
devlink/devlink.c
View File

@ -395,6 +395,17 @@ static void __pr_out_indent_newline(struct dl *dl)
pr_out(" "); pr_out(" ");
} }
static void check_indent_newline(struct dl *dl)
{
__pr_out_indent_newline(dl);
if (g_indent_newline && !is_json_context()) {
printf("%s", g_indent_str);
g_indent_newline = false;
}
g_new_line_count = 0;
}
static const enum mnl_attr_data_type devlink_policy[DEVLINK_ATTR_MAX + 1] = { static const enum mnl_attr_data_type devlink_policy[DEVLINK_ATTR_MAX + 1] = {
[DEVLINK_ATTR_BUS_NAME] = MNL_TYPE_NUL_STRING, [DEVLINK_ATTR_BUS_NAME] = MNL_TYPE_NUL_STRING,
[DEVLINK_ATTR_DEV_NAME] = MNL_TYPE_NUL_STRING, [DEVLINK_ATTR_DEV_NAME] = MNL_TYPE_NUL_STRING,
@ -1865,22 +1876,12 @@ static void pr_out_port_handle_end(struct dl *dl)
pr_out("\n"); pr_out("\n");
} }
static void pr_out_str(struct dl *dl, const char *name, const char *val)
{
__pr_out_indent_newline(dl);
if (dl->json_output)
print_string(PRINT_JSON, name, NULL, val);
else
pr_out("%s %s", name, val);
}
static void pr_out_bool(struct dl *dl, const char *name, bool val) static void pr_out_bool(struct dl *dl, const char *name, bool val)
{ {
if (dl->json_output) if (dl->json_output)
print_bool(PRINT_JSON, name, NULL, val); print_bool(PRINT_JSON, name, NULL, val);
else else
pr_out_str(dl, name, val ? "true" : "false"); print_string_name_value(name, val ? "true" : "false");
} }
static void pr_out_uint(struct dl *dl, const char *name, unsigned int val) static void pr_out_uint(struct dl *dl, const char *name, unsigned int val)
@ -1896,7 +1897,7 @@ static void pr_out_u64(struct dl *dl, const char *name, uint64_t val)
{ {
__pr_out_indent_newline(dl); __pr_out_indent_newline(dl);
if (val == (uint64_t) -1) if (val == (uint64_t) -1)
return pr_out_str(dl, name, "unlimited"); return print_string_name_value(name, "unlimited");
if (dl->json_output) if (dl->json_output)
print_u64(PRINT_JSON, name, NULL, val); print_u64(PRINT_JSON, name, NULL, val);
@ -1953,15 +1954,6 @@ static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len)
__pr_out_newline(); __pr_out_newline();
} }
static void pr_out_str_value(struct dl *dl, const char *value)
{
__pr_out_indent_newline(dl);
if (dl->json_output)
print_string(PRINT_JSON, NULL, NULL, value);
else
pr_out("%s", value);
}
static void pr_out_name(struct dl *dl, const char *name) static void pr_out_name(struct dl *dl, const char *name)
{ {
__pr_out_indent_newline(dl); __pr_out_indent_newline(dl);
@ -2156,19 +2148,24 @@ static void pr_out_eswitch(struct dl *dl, struct nlattr **tb)
{ {
__pr_out_handle_start(dl, tb, true, false); __pr_out_handle_start(dl, tb, true, false);
if (tb[DEVLINK_ATTR_ESWITCH_MODE]) if (tb[DEVLINK_ATTR_ESWITCH_MODE]) {
pr_out_str(dl, "mode", check_indent_newline(dl);
eswitch_mode_name(mnl_attr_get_u16(tb[DEVLINK_ATTR_ESWITCH_MODE]))); print_string(PRINT_ANY, "mode", "mode %s",
eswitch_mode_name(mnl_attr_get_u16(
if (tb[DEVLINK_ATTR_ESWITCH_INLINE_MODE]) tb[DEVLINK_ATTR_ESWITCH_MODE])));
pr_out_str(dl, "inline-mode", }
eswitch_inline_mode_name(mnl_attr_get_u8( if (tb[DEVLINK_ATTR_ESWITCH_INLINE_MODE]) {
tb[DEVLINK_ATTR_ESWITCH_INLINE_MODE]))); check_indent_newline(dl);
print_string(PRINT_ANY, "inline-mode", "inline-mode %s",
eswitch_inline_mode_name(mnl_attr_get_u8(
tb[DEVLINK_ATTR_ESWITCH_INLINE_MODE])));
}
if (tb[DEVLINK_ATTR_ESWITCH_ENCAP_MODE]) { if (tb[DEVLINK_ATTR_ESWITCH_ENCAP_MODE]) {
bool encap_mode = !!mnl_attr_get_u8(tb[DEVLINK_ATTR_ESWITCH_ENCAP_MODE]); bool encap_mode = !!mnl_attr_get_u8(tb[DEVLINK_ATTR_ESWITCH_ENCAP_MODE]);
pr_out_str(dl, "encap", encap_mode ? "enable" : "disable"); check_indent_newline(dl);
print_string(PRINT_ANY, "encap", "encap %s",
encap_mode ? "enable" : "disable");
} }
pr_out_handle_end(dl); pr_out_handle_end(dl);
@ -2355,8 +2352,10 @@ static void pr_out_param_value(struct dl *dl, const char *nla_name,
!nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA])) !nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA]))
return; return;
pr_out_str(dl, "cmode", check_indent_newline(dl);
param_cmode_name(mnl_attr_get_u8(nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE]))); print_string(PRINT_ANY, "cmode", "cmode %s",
param_cmode_name(mnl_attr_get_u8(nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE])));
val_attr = nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA]; val_attr = nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA];
conv_exists = param_val_conv_exists(param_val_conv, PARAM_VAL_CONV_LEN, conv_exists = param_val_conv_exists(param_val_conv, PARAM_VAL_CONV_LEN,
@ -2372,7 +2371,7 @@ static void pr_out_param_value(struct dl *dl, const char *nla_name,
&vstr); &vstr);
if (err) if (err)
return; return;
pr_out_str(dl, "value", vstr); print_string(PRINT_ANY, "value", " value %s", vstr);
} else { } else {
pr_out_uint(dl, "value", mnl_attr_get_u8(val_attr)); pr_out_uint(dl, "value", mnl_attr_get_u8(val_attr));
} }
@ -2386,7 +2385,7 @@ static void pr_out_param_value(struct dl *dl, const char *nla_name,
&vstr); &vstr);
if (err) if (err)
return; return;
pr_out_str(dl, "value", vstr); print_string(PRINT_ANY, "value", " value %s", vstr);
} else { } else {
pr_out_uint(dl, "value", mnl_attr_get_u16(val_attr)); pr_out_uint(dl, "value", mnl_attr_get_u16(val_attr));
} }
@ -2400,13 +2399,14 @@ static void pr_out_param_value(struct dl *dl, const char *nla_name,
&vstr); &vstr);
if (err) if (err)
return; return;
pr_out_str(dl, "value", vstr); print_string(PRINT_ANY, "value", " value %s", vstr);
} else { } else {
pr_out_uint(dl, "value", mnl_attr_get_u32(val_attr)); pr_out_uint(dl, "value", mnl_attr_get_u32(val_attr));
} }
break; break;
case MNL_TYPE_STRING: case MNL_TYPE_STRING:
pr_out_str(dl, "value", mnl_attr_get_str(val_attr)); print_string(PRINT_ANY, "value", " value %s",
mnl_attr_get_str(val_attr));
break; break;
case MNL_TYPE_FLAG: case MNL_TYPE_FLAG:
pr_out_bool(dl, "value", val_attr ? true : false); pr_out_bool(dl, "value", val_attr ? true : false);
@ -2438,12 +2438,12 @@ static void pr_out_param(struct dl *dl, struct nlattr **tb, bool array)
nla_type = mnl_attr_get_u8(nla_param[DEVLINK_ATTR_PARAM_TYPE]); nla_type = mnl_attr_get_u8(nla_param[DEVLINK_ATTR_PARAM_TYPE]);
nla_name = mnl_attr_get_str(nla_param[DEVLINK_ATTR_PARAM_NAME]); nla_name = mnl_attr_get_str(nla_param[DEVLINK_ATTR_PARAM_NAME]);
pr_out_str(dl, "name", nla_name); check_indent_newline(dl);
print_string(PRINT_ANY, "name", "name %s ", nla_name);
if (!nla_param[DEVLINK_ATTR_PARAM_GENERIC]) if (!nla_param[DEVLINK_ATTR_PARAM_GENERIC])
pr_out_str(dl, "type", "driver-specific"); print_string(PRINT_ANY, "type", "type %s", "driver-specific");
else else
pr_out_str(dl, "type", "generic"); print_string(PRINT_ANY, "type", "type %s", "generic");
pr_out_array_start(dl, "values"); pr_out_array_start(dl, "values");
mnl_attr_for_each_nested(param_value_attr, mnl_attr_for_each_nested(param_value_attr,
@ -2807,7 +2807,8 @@ static void pr_out_versions_single(struct dl *dl, const struct nlmsghdr *nlh,
ver_name = mnl_attr_get_str(tb[DEVLINK_ATTR_INFO_VERSION_NAME]); ver_name = mnl_attr_get_str(tb[DEVLINK_ATTR_INFO_VERSION_NAME]);
ver_value = mnl_attr_get_str(tb[DEVLINK_ATTR_INFO_VERSION_VALUE]); ver_value = mnl_attr_get_str(tb[DEVLINK_ATTR_INFO_VERSION_VALUE]);
pr_out_str(dl, ver_name, ver_value); check_indent_newline(dl);
print_string_name_value(ver_name, ver_value);
if (!dl->json_output) if (!dl->json_output)
__pr_out_newline(); __pr_out_newline();
} }
@ -2827,7 +2828,9 @@ static void pr_out_info(struct dl *dl, const struct nlmsghdr *nlh,
if (!dl->json_output) if (!dl->json_output)
__pr_out_newline(); __pr_out_newline();
pr_out_str(dl, "driver", mnl_attr_get_str(nla_drv)); check_indent_newline(dl);
print_string(PRINT_ANY, "driver", "driver %s",
mnl_attr_get_str(nla_drv));
} }
if (tb[DEVLINK_ATTR_INFO_SERIAL_NUMBER]) { if (tb[DEVLINK_ATTR_INFO_SERIAL_NUMBER]) {
@ -2835,7 +2838,9 @@ static void pr_out_info(struct dl *dl, const struct nlmsghdr *nlh,
if (!dl->json_output) if (!dl->json_output)
__pr_out_newline(); __pr_out_newline();
pr_out_str(dl, "serial_number", mnl_attr_get_str(nla_sn)); check_indent_newline(dl);
print_string(PRINT_ANY, "serial_number", "serial_number %s",
mnl_attr_get_str(nla_sn));
} }
__pr_out_indent_dec(); __pr_out_indent_dec();
@ -3208,29 +3213,34 @@ static void pr_out_port(struct dl *dl, struct nlattr **tb)
struct nlattr *dpt_attr = tb[DEVLINK_ATTR_PORT_DESIRED_TYPE]; struct nlattr *dpt_attr = tb[DEVLINK_ATTR_PORT_DESIRED_TYPE];
pr_out_port_handle_start(dl, tb, false); pr_out_port_handle_start(dl, tb, false);
check_indent_newline(dl);
if (pt_attr) { if (pt_attr) {
uint16_t port_type = mnl_attr_get_u16(pt_attr); uint16_t port_type = mnl_attr_get_u16(pt_attr);
pr_out_str(dl, "type", port_type_name(port_type)); print_string(PRINT_ANY, "type", "type %s",
port_type_name(port_type));
if (dpt_attr) { if (dpt_attr) {
uint16_t des_port_type = mnl_attr_get_u16(dpt_attr); uint16_t des_port_type = mnl_attr_get_u16(dpt_attr);
if (port_type != des_port_type) if (port_type != des_port_type)
pr_out_str(dl, "des_type", print_string(PRINT_ANY, "des_type", " des_type %s",
port_type_name(des_port_type)); port_type_name(des_port_type));
} }
} }
if (tb[DEVLINK_ATTR_PORT_NETDEV_NAME]) if (tb[DEVLINK_ATTR_PORT_NETDEV_NAME]) {
pr_out_str(dl, "netdev", print_string(PRINT_ANY, "netdev", " netdev %s",
mnl_attr_get_str(tb[DEVLINK_ATTR_PORT_NETDEV_NAME])); mnl_attr_get_str(tb[DEVLINK_ATTR_PORT_NETDEV_NAME]));
if (tb[DEVLINK_ATTR_PORT_IBDEV_NAME]) }
pr_out_str(dl, "ibdev", if (tb[DEVLINK_ATTR_PORT_IBDEV_NAME]) {
mnl_attr_get_str(tb[DEVLINK_ATTR_PORT_IBDEV_NAME])); print_string(PRINT_ANY, "ibdev", " ibdev %s",
mnl_attr_get_str(tb[DEVLINK_ATTR_PORT_IBDEV_NAME]));
}
if (tb[DEVLINK_ATTR_PORT_FLAVOUR]) { if (tb[DEVLINK_ATTR_PORT_FLAVOUR]) {
uint16_t port_flavour = uint16_t port_flavour =
mnl_attr_get_u16(tb[DEVLINK_ATTR_PORT_FLAVOUR]); mnl_attr_get_u16(tb[DEVLINK_ATTR_PORT_FLAVOUR]);
pr_out_str(dl, "flavour", port_flavour_name(port_flavour)); print_string(PRINT_ANY, "flavour", " flavour %s",
port_flavour_name(port_flavour));
switch (port_flavour) { switch (port_flavour) {
case DEVLINK_PORT_FLAVOUR_PCI_PF: case DEVLINK_PORT_FLAVOUR_PCI_PF:
@ -3381,6 +3391,7 @@ static void cmd_sb_help(void)
static void pr_out_sb(struct dl *dl, struct nlattr **tb) static void pr_out_sb(struct dl *dl, struct nlattr **tb)
{ {
pr_out_handle_start_arr(dl, tb); pr_out_handle_start_arr(dl, tb);
check_indent_newline(dl);
pr_out_uint(dl, "sb", pr_out_uint(dl, "sb",
mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX])); mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX]));
pr_out_uint(dl, "size", pr_out_uint(dl, "size",
@ -3462,12 +3473,12 @@ static void pr_out_sb_pool(struct dl *dl, struct nlattr **tb)
mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX])); mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX]));
pr_out_uint(dl, "pool", pr_out_uint(dl, "pool",
mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_POOL_INDEX])); mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_POOL_INDEX]));
pr_out_str(dl, "type", print_string(PRINT_ANY, "type", " type %s",
pool_type_name(mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_TYPE]))); pool_type_name(mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_TYPE])));
pr_out_uint(dl, "size", pr_out_uint(dl, "size",
mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_POOL_SIZE])); mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_POOL_SIZE]));
pr_out_str(dl, "thtype", print_string(PRINT_ANY, "thtype", " thtype %s",
threshold_type_name(mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE]))); threshold_type_name(mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE])));
if (tb[DEVLINK_ATTR_SB_POOL_CELL_SIZE]) if (tb[DEVLINK_ATTR_SB_POOL_CELL_SIZE])
pr_out_uint(dl, "cell_size", pr_out_uint(dl, "cell_size",
mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_POOL_CELL_SIZE])); mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_POOL_CELL_SIZE]));
@ -3652,8 +3663,8 @@ static void pr_out_sb_tc_bind(struct dl *dl, struct nlattr **tb)
mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX])); mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX]));
pr_out_uint(dl, "tc", pr_out_uint(dl, "tc",
mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_TC_INDEX])); mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_TC_INDEX]));
pr_out_str(dl, "type", print_string(PRINT_ANY, "type", " type %s",
pool_type_name(mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_TYPE]))); pool_type_name(mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_TYPE])));
pr_out_uint(dl, "pool", pr_out_uint(dl, "pool",
mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_POOL_INDEX])); mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_POOL_INDEX]));
pr_out_uint(dl, "threshold", pr_out_uint(dl, "threshold",
@ -4232,13 +4243,16 @@ static void pr_out_flash_update(struct dl *dl, struct nlattr **tb)
{ {
__pr_out_handle_start(dl, tb, true, false); __pr_out_handle_start(dl, tb, true, false);
if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG]) if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG]) {
pr_out_str(dl, "msg", check_indent_newline(dl);
mnl_attr_get_str(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG])); print_string(PRINT_ANY, "msg", "msg %s",
mnl_attr_get_str(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG]));
if (tb[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT]) }
pr_out_str(dl, "component", if (tb[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT]) {
mnl_attr_get_str(tb[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT])); check_indent_newline(dl);
print_string(PRINT_ANY, "component", "component %s",
mnl_attr_get_str(tb[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT]));
}
if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE]) if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE])
pr_out_u64(dl, "done", pr_out_u64(dl, "done",
@ -4705,13 +4719,15 @@ static void pr_out_dpipe_fields(struct dpipe_ctx *ctx,
for (i = 0; i < field_count; i++) { for (i = 0; i < field_count; i++) {
field = &fields[i]; field = &fields[i];
pr_out_entry_start(ctx->dl); pr_out_entry_start(ctx->dl);
pr_out_str(ctx->dl, "name", field->name); check_indent_newline(ctx->dl);
print_string(PRINT_ANY, "name", "name %s", field->name);
if (ctx->dl->verbose) if (ctx->dl->verbose)
pr_out_uint(ctx->dl, "id", field->id); pr_out_uint(ctx->dl, "id", field->id);
pr_out_uint(ctx->dl, "bitwidth", field->bitwidth); pr_out_uint(ctx->dl, "bitwidth", field->bitwidth);
if (field->mapping_type) if (field->mapping_type) {
pr_out_str(ctx->dl, "mapping_type", print_string(PRINT_ANY, "mapping_type", " mapping_type %s",
dpipe_field_mapping_e2s(field->mapping_type)); dpipe_field_mapping_e2s(field->mapping_type));
}
pr_out_entry_end(ctx->dl); pr_out_entry_end(ctx->dl);
} }
} }
@ -4721,11 +4737,11 @@ pr_out_dpipe_header(struct dpipe_ctx *ctx, struct nlattr **tb,
struct dpipe_header *header, bool global) struct dpipe_header *header, bool global)
{ {
pr_out_handle_start_arr(ctx->dl, tb); pr_out_handle_start_arr(ctx->dl, tb);
pr_out_str(ctx->dl, "name", header->name); check_indent_newline(ctx->dl);
print_string(PRINT_ANY, "name", "name %s", header->name);
if (ctx->dl->verbose) { if (ctx->dl->verbose) {
pr_out_uint(ctx->dl, "id", header->id); pr_out_uint(ctx->dl, "id", header->id);
pr_out_str(ctx->dl, "global", print_bool(PRINT_ANY, "global", " global %s", global);
global ? "true" : "false");
} }
pr_out_array_start(ctx->dl, "field"); pr_out_array_start(ctx->dl, "field");
pr_out_dpipe_fields(ctx, header->fields, pr_out_dpipe_fields(ctx, header->fields,
@ -4949,20 +4965,21 @@ static void pr_out_dpipe_action(struct dpipe_action *action,
struct dpipe_op_info *op_info = &action->info; struct dpipe_op_info *op_info = &action->info;
const char *mapping; const char *mapping;
pr_out_str(ctx->dl, "type", check_indent_newline(ctx->dl);
dpipe_action_type_e2s(action->type)); print_string(PRINT_ANY, "type", "type %s",
pr_out_str(ctx->dl, "header", dpipe_action_type_e2s(action->type));
dpipe_header_id2s(ctx, op_info->header_id, print_string(PRINT_ANY, "header", " header %s",
op_info->header_global)); dpipe_header_id2s(ctx, op_info->header_id,
pr_out_str(ctx->dl, "field", op_info->header_global));
dpipe_field_id2s(ctx, op_info->header_id, print_string(PRINT_ANY, "field", " field %s",
op_info->field_id, dpipe_field_id2s(ctx, op_info->header_id,
op_info->header_global)); op_info->field_id,
op_info->header_global));
mapping = dpipe_mapping_get(ctx, op_info->header_id, mapping = dpipe_mapping_get(ctx, op_info->header_id,
op_info->field_id, op_info->field_id,
op_info->header_global); op_info->header_global);
if (mapping) if (mapping)
pr_out_str(ctx->dl, "mapping", mapping); print_string(PRINT_ANY, "mapping", " mapping %s", mapping);
} }
static int dpipe_action_parse(struct dpipe_action *action, struct nlattr *nl) static int dpipe_action_parse(struct dpipe_action *action, struct nlattr *nl)
@ -5031,20 +5048,21 @@ static void pr_out_dpipe_match(struct dpipe_match *match,
struct dpipe_op_info *op_info = &match->info; struct dpipe_op_info *op_info = &match->info;
const char *mapping; const char *mapping;
pr_out_str(ctx->dl, "type", check_indent_newline(ctx->dl);
dpipe_match_type_e2s(match->type)); print_string(PRINT_ANY, "type", "type %s",
pr_out_str(ctx->dl, "header", dpipe_match_type_e2s(match->type));
dpipe_header_id2s(ctx, op_info->header_id, print_string(PRINT_ANY, "header", " header %s",
op_info->header_global)); dpipe_header_id2s(ctx, op_info->header_id,
pr_out_str(ctx->dl, "field", op_info->header_global));
dpipe_field_id2s(ctx, op_info->header_id, print_string(PRINT_ANY, "field", " field %s",
op_info->field_id, dpipe_field_id2s(ctx, op_info->header_id,
op_info->header_global)); op_info->field_id,
op_info->header_global));
mapping = dpipe_mapping_get(ctx, op_info->header_id, mapping = dpipe_mapping_get(ctx, op_info->header_id,
op_info->field_id, op_info->field_id,
op_info->header_global); op_info->header_global);
if (mapping) if (mapping)
pr_out_str(ctx->dl, "mapping", mapping); print_string(PRINT_ANY, "mapping", " mapping %s", mapping);
} }
static int dpipe_match_parse(struct dpipe_match *match, static int dpipe_match_parse(struct dpipe_match *match,
@ -5149,7 +5167,8 @@ resource_path_print(struct dl *dl, struct resources *resources,
path -= strlen(del); path -= strlen(del);
memcpy(path, del, strlen(del)); memcpy(path, del, strlen(del));
} }
pr_out_str(dl, "resource_path", path); check_indent_newline(dl);
print_string(PRINT_ANY, "resource_path", "resource_path %s", path);
free(path); free(path);
} }
@ -5194,10 +5213,10 @@ static int dpipe_table_show(struct dpipe_ctx *ctx, struct nlattr *nl)
if (!ctx->print_tables) if (!ctx->print_tables)
return 0; return 0;
pr_out_str(ctx->dl, "name", table->name); check_indent_newline(ctx->dl);
print_string(PRINT_ANY, "name", "name %s", table->name);
pr_out_uint(ctx->dl, "size", size); pr_out_uint(ctx->dl, "size", size);
pr_out_str(ctx->dl, "counters_enabled", print_bool(PRINT_ANY, "counters_enabled", " counters_enabled %s", counters_enabled);
counters_enabled ? "true" : "false");
if (resource_valid) { if (resource_valid) {
resource_units = mnl_attr_get_u32(nla_table[DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS]); resource_units = mnl_attr_get_u32(nla_table[DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS]);
@ -5374,7 +5393,8 @@ static void dpipe_field_printer_ipv4_addr(struct dpipe_ctx *ctx,
struct in_addr ip_addr; struct in_addr ip_addr;
ip_addr.s_addr = htonl(*(uint32_t *)value); ip_addr.s_addr = htonl(*(uint32_t *)value);
pr_out_str(ctx->dl, dpipe_value_type_e2s(type), inet_ntoa(ip_addr)); check_indent_newline(ctx->dl);
print_string_name_value(dpipe_value_type_e2s(type), inet_ntoa(ip_addr));
} }
static void static void
@ -5382,8 +5402,9 @@ dpipe_field_printer_ethernet_addr(struct dpipe_ctx *ctx,
enum dpipe_value_type type, enum dpipe_value_type type,
void *value) void *value)
{ {
pr_out_str(ctx->dl, dpipe_value_type_e2s(type), check_indent_newline(ctx->dl);
ether_ntoa((struct ether_addr *)value)); print_string_name_value(dpipe_value_type_e2s(type),
ether_ntoa((struct ether_addr *)value));
} }
static void dpipe_field_printer_ipv6_addr(struct dpipe_ctx *ctx, static void dpipe_field_printer_ipv6_addr(struct dpipe_ctx *ctx,
@ -5393,7 +5414,8 @@ static void dpipe_field_printer_ipv6_addr(struct dpipe_ctx *ctx,
char str[INET6_ADDRSTRLEN]; char str[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, value, str, INET6_ADDRSTRLEN); inet_ntop(AF_INET6, value, str, INET6_ADDRSTRLEN);
pr_out_str(ctx->dl, dpipe_value_type_e2s(type), str); check_indent_newline(ctx->dl);
print_string_name_value(dpipe_value_type_e2s(type), str);
} }
static struct dpipe_field_printer dpipe_field_printers_ipv4[] = { static struct dpipe_field_printer dpipe_field_printers_ipv4[] = {
@ -5872,7 +5894,8 @@ static void resource_show(struct resource *resource,
struct dl *dl = ctx->dl; struct dl *dl = ctx->dl;
bool array = false; bool array = false;
pr_out_str(dl, "name", resource->name); check_indent_newline(dl);
print_string(PRINT_ANY, "name", "name %s", resource->name);
if (dl->verbose) if (dl->verbose)
resource_path_print(dl, ctx->resources, resource->id); resource_path_print(dl, ctx->resources, resource->id);
pr_out_u64(dl, "size", resource->size); pr_out_u64(dl, "size", resource->size);
@ -5880,7 +5903,8 @@ static void resource_show(struct resource *resource,
pr_out_u64(dl, "size_new", resource->size_new); pr_out_u64(dl, "size_new", resource->size_new);
if (resource->occ_valid) if (resource->occ_valid)
pr_out_uint(dl, "occ", resource->size_occ); pr_out_uint(dl, "occ", resource->size_occ);
pr_out_str(dl, "unit", resource_unit_str_get(resource->unit)); print_string(PRINT_ANY, "unit", " unit %s",
resource_unit_str_get(resource->unit));
if (resource->size_min != resource->size_max) { if (resource->size_min != resource->size_max) {
pr_out_uint(dl, "size_min", resource->size_min); pr_out_uint(dl, "size_min", resource->size_min);
@ -5896,14 +5920,17 @@ static void resource_show(struct resource *resource,
if (array) if (array)
pr_out_array_start(dl, "dpipe_tables"); pr_out_array_start(dl, "dpipe_tables");
else else
pr_out_str(dl, "dpipe_tables", "none"); print_string(PRINT_ANY, "dpipe_tables", " dpipe_tables none",
"none");
list_for_each_entry(table, &ctx->tables->table_list, list) { list_for_each_entry(table, &ctx->tables->table_list, list) {
if (table->resource_id != resource->id || if (table->resource_id != resource->id ||
!table->resource_valid) !table->resource_valid)
continue; continue;
pr_out_entry_start(dl); pr_out_entry_start(dl);
pr_out_str(dl, "table_name", table->name); check_indent_newline(dl);
print_string(PRINT_ANY, "table_name", "table_name %s",
table->name);
pr_out_entry_end(dl); pr_out_entry_end(dl);
} }
if (array) if (array)
@ -5912,9 +5939,11 @@ static void resource_show(struct resource *resource,
if (list_empty(&resource->resource_list)) if (list_empty(&resource->resource_list))
return; return;
if (ctx->pending_change) if (ctx->pending_change) {
pr_out_str(dl, "size_valid", resource->size_valid ? check_indent_newline(dl);
"true" : "false"); print_string(PRINT_ANY, "size_valid", "size_valid %s",
resource->size_valid ? "true" : "false");
}
pr_out_array_start(dl, "resources"); pr_out_array_start(dl, "resources");
list_for_each_entry(child_resource, &resource->resource_list, list) { list_for_each_entry(child_resource, &resource->resource_list, list) {
pr_out_entry_start(dl); pr_out_entry_start(dl);
@ -6418,6 +6447,7 @@ static int fmsg_value_show(struct dl *dl, int type, struct nlattr *nl_data)
uint8_t *data; uint8_t *data;
uint32_t len; uint32_t len;
check_indent_newline(dl);
switch (type) { switch (type) {
case MNL_TYPE_FLAG: case MNL_TYPE_FLAG:
pr_out_bool_value(dl, mnl_attr_get_u8(nl_data)); pr_out_bool_value(dl, mnl_attr_get_u8(nl_data));
@ -6435,7 +6465,7 @@ static int fmsg_value_show(struct dl *dl, int type, struct nlattr *nl_data)
pr_out_uint64_value(dl, mnl_attr_get_u64(nl_data)); pr_out_uint64_value(dl, mnl_attr_get_u64(nl_data));
break; break;
case MNL_TYPE_NUL_STRING: case MNL_TYPE_NUL_STRING:
pr_out_str_value(dl, mnl_attr_get_str(nl_data)); print_string(PRINT_ANY, NULL, "%s", mnl_attr_get_str(nl_data));
break; break;
case MNL_TYPE_BINARY: case MNL_TYPE_BINARY:
len = mnl_attr_get_payload_len(nl_data); len = mnl_attr_get_payload_len(nl_data);
@ -6733,8 +6763,9 @@ static void pr_out_dump_reporter_format_logtime(struct dl *dl, const struct nlat
out: out:
strftime(dump_date, HEALTH_REPORTER_TIMESTAMP_FMT_LEN, "%Y-%m-%d", info); strftime(dump_date, HEALTH_REPORTER_TIMESTAMP_FMT_LEN, "%Y-%m-%d", info);
strftime(dump_time, HEALTH_REPORTER_TIMESTAMP_FMT_LEN, "%H:%M:%S", info); strftime(dump_time, HEALTH_REPORTER_TIMESTAMP_FMT_LEN, "%H:%M:%S", info);
pr_out_str(dl, "last_dump_date", dump_date); check_indent_newline(dl);
pr_out_str(dl, "last_dump_time", dump_time); print_string(PRINT_ANY, "last_dump_date", "last_dump_date %s", dump_date);
print_string(PRINT_ANY, "last_dump_time", " last_dump_time %s", dump_time);
} }
static void pr_out_dump_report_timestamp(struct dl *dl, const struct nlattr *attr) static void pr_out_dump_report_timestamp(struct dl *dl, const struct nlattr *attr)
@ -6752,8 +6783,9 @@ static void pr_out_dump_report_timestamp(struct dl *dl, const struct nlattr *att
strftime(dump_date, HEALTH_REPORTER_TIMESTAMP_FMT_LEN, "%Y-%m-%d", tm); strftime(dump_date, HEALTH_REPORTER_TIMESTAMP_FMT_LEN, "%Y-%m-%d", tm);
strftime(dump_time, HEALTH_REPORTER_TIMESTAMP_FMT_LEN, "%H:%M:%S", tm); strftime(dump_time, HEALTH_REPORTER_TIMESTAMP_FMT_LEN, "%H:%M:%S", tm);
pr_out_str(dl, "last_dump_date", dump_date); check_indent_newline(dl);
pr_out_str(dl, "last_dump_time", dump_time); print_string(PRINT_ANY, "last_dump_date", "last_dump_date %s", dump_date);
print_string(PRINT_ANY, "last_dump_time", " last_dump_time %s", dump_time);
} }
static void pr_out_health(struct dl *dl, struct nlattr **tb_health) static void pr_out_health(struct dl *dl, struct nlattr **tb_health)
@ -6775,14 +6807,16 @@ static void pr_out_health(struct dl *dl, struct nlattr **tb_health)
pr_out_handle_start_arr(dl, tb_health); pr_out_handle_start_arr(dl, tb_health);
pr_out_str(dl, "reporter", check_indent_newline(dl);
mnl_attr_get_str(tb[DEVLINK_ATTR_HEALTH_REPORTER_NAME])); print_string(PRINT_ANY, "reporter", "reporter %s",
mnl_attr_get_str(tb[DEVLINK_ATTR_HEALTH_REPORTER_NAME]));
if (!dl->json_output) { if (!dl->json_output) {
__pr_out_newline(); __pr_out_newline();
__pr_out_indent_inc(); __pr_out_indent_inc();
} }
state = mnl_attr_get_u8(tb[DEVLINK_ATTR_HEALTH_REPORTER_STATE]); state = mnl_attr_get_u8(tb[DEVLINK_ATTR_HEALTH_REPORTER_STATE]);
pr_out_str(dl, "state", health_state_name(state)); check_indent_newline(dl);
print_string(PRINT_ANY, "state", "state %s", health_state_name(state));
pr_out_u64(dl, "error", pr_out_u64(dl, "error",
mnl_attr_get_u64(tb[DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT])); mnl_attr_get_u64(tb[DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT]));
pr_out_u64(dl, "recover", pr_out_u64(dl, "recover",
@ -6923,8 +6957,11 @@ static void pr_out_trap_metadata(struct dl *dl, struct nlattr *attr)
struct nlattr *attr_metadata; struct nlattr *attr_metadata;
pr_out_array_start(dl, "metadata"); pr_out_array_start(dl, "metadata");
mnl_attr_for_each_nested(attr_metadata, attr) mnl_attr_for_each_nested(attr_metadata, attr) {
pr_out_str_value(dl, trap_metadata_name(attr_metadata)); check_indent_newline(dl);
print_string(PRINT_ANY, NULL, "%s",
trap_metadata_name(attr_metadata));
}
pr_out_array_end(dl); pr_out_array_end(dl);
} }
@ -6938,12 +6975,14 @@ static void pr_out_trap(struct dl *dl, struct nlattr **tb, bool array)
else else
__pr_out_handle_start(dl, tb, true, false); __pr_out_handle_start(dl, tb, true, false);
pr_out_str(dl, "name", mnl_attr_get_str(tb[DEVLINK_ATTR_TRAP_NAME])); check_indent_newline(dl);
pr_out_str(dl, "type", trap_type_name(type)); print_string(PRINT_ANY, "name", "name %s",
mnl_attr_get_str(tb[DEVLINK_ATTR_TRAP_NAME]));
print_string(PRINT_ANY, "type", " type %s", trap_type_name(type));
pr_out_bool(dl, "generic", !!tb[DEVLINK_ATTR_TRAP_GENERIC]); pr_out_bool(dl, "generic", !!tb[DEVLINK_ATTR_TRAP_GENERIC]);
pr_out_str(dl, "action", trap_action_name(action)); print_string(PRINT_ANY, "action", " action %s", trap_action_name(action));
pr_out_str(dl, "group", print_string(PRINT_ANY, "group", " group %s",
mnl_attr_get_str(tb[DEVLINK_ATTR_TRAP_GROUP_NAME])); mnl_attr_get_str(tb[DEVLINK_ATTR_TRAP_GROUP_NAME]));
if (dl->verbose) if (dl->verbose)
pr_out_trap_metadata(dl, tb[DEVLINK_ATTR_TRAP_METADATA]); pr_out_trap_metadata(dl, tb[DEVLINK_ATTR_TRAP_METADATA]);
pr_out_stats(dl, tb[DEVLINK_ATTR_STATS]); pr_out_stats(dl, tb[DEVLINK_ATTR_STATS]);
@ -7025,8 +7064,9 @@ static void pr_out_trap_group(struct dl *dl, struct nlattr **tb, bool array)
else else
__pr_out_handle_start(dl, tb, true, false); __pr_out_handle_start(dl, tb, true, false);
pr_out_str(dl, "name", check_indent_newline(dl);
mnl_attr_get_str(tb[DEVLINK_ATTR_TRAP_GROUP_NAME])); print_string(PRINT_ANY, "name", "name %s",
mnl_attr_get_str(tb[DEVLINK_ATTR_TRAP_GROUP_NAME]));
pr_out_bool(dl, "generic", !!tb[DEVLINK_ATTR_TRAP_GENERIC]); pr_out_bool(dl, "generic", !!tb[DEVLINK_ATTR_TRAP_GENERIC]);
pr_out_stats(dl, tb[DEVLINK_ATTR_STATS]); pr_out_stats(dl, tb[DEVLINK_ATTR_STATS]);
pr_out_handle_end(dl); pr_out_handle_end(dl);