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

rdma: Add json and pretty outputs 

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
This commit is contained in:
Leon Romanovsky 2017-08-20 12:58:25 +03:00 committed by Stephen Hemminger
parent da990ab40a
commit ab6e2b7bdb
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
rdma/rdma.c
View File

@ -16,7 +16,7 @@ static void help(char *name)
{ {
pr_out("Usage: %s [ OPTIONS ] OBJECT { COMMAND | help }\n" pr_out("Usage: %s [ OPTIONS ] OBJECT { COMMAND | help }\n"
"where OBJECT := { dev | link | help }\n" "where OBJECT := { dev | link | help }\n"
" OPTIONS := { -V[ersion] | -d[etails]}\n", name); " OPTIONS := { -V[ersion] | -d[etails] | -j[son] | -p[retty]}\n", name);
} }
static int cmd_help(struct rd *rd) static int cmd_help(struct rd *rd)
@ -47,6 +47,16 @@ static int rd_init(struct rd *rd, int argc, char **argv, char *filename)
rd->argc = argc; rd->argc = argc;
rd->argv = argv; rd->argv = argv;
INIT_LIST_HEAD(&rd->dev_map_list); INIT_LIST_HEAD(&rd->dev_map_list);
if (rd->json_output) {
rd->jw = jsonw_new(stdout);
if (!rd->jw) {
pr_err("Failed to create JSON writer\n");
return -ENOMEM;
}
jsonw_pretty(rd->jw, rd->pretty_output);
}
rd->buff = malloc(MNL_SOCKET_BUFFER_SIZE); rd->buff = malloc(MNL_SOCKET_BUFFER_SIZE);
if (!rd->buff) if (!rd->buff)
return -ENOMEM; return -ENOMEM;
@ -62,6 +72,8 @@ static int rd_init(struct rd *rd, int argc, char **argv, char *filename)
static void rd_free(struct rd *rd) static void rd_free(struct rd *rd)
{ {
if (rd->json_output)
jsonw_destroy(&rd->jw);
free(rd->buff); free(rd->buff);
rd_free_devmap(rd); rd_free_devmap(rd);
} }
@ -71,10 +83,14 @@ int main(int argc, char **argv)
static const struct option long_options[] = { static const struct option long_options[] = {
{ "version", no_argument, NULL, 'V' }, { "version", no_argument, NULL, 'V' },
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ "json", no_argument, NULL, 'j' },
{ "pretty", no_argument, NULL, 'p' },
{ "details", no_argument, NULL, 'd' }, { "details", no_argument, NULL, 'd' },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
bool pretty_output = false;
bool show_details = false; bool show_details = false;
bool json_output = false;
char *filename; char *filename;
struct rd rd; struct rd rd;
int opt; int opt;
@ -82,16 +98,22 @@ int main(int argc, char **argv)
filename = basename(argv[0]); filename = basename(argv[0]);
while ((opt = getopt_long(argc, argv, "Vhd", while ((opt = getopt_long(argc, argv, "Vhdpj",
long_options, NULL)) >= 0) { long_options, NULL)) >= 0) {
switch (opt) { switch (opt) {
case 'V': case 'V':
printf("%s utility, iproute2-ss%s\n", printf("%s utility, iproute2-ss%s\n",
filename, SNAPSHOT); filename, SNAPSHOT);
return EXIT_SUCCESS; return EXIT_SUCCESS;
case 'p':
pretty_output = true;
break;
case 'd': case 'd':
show_details = true; show_details = true;
break; break;
case 'j':
json_output = true;
break;
case 'h': case 'h':
help(filename); help(filename);
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -105,11 +127,14 @@ int main(int argc, char **argv)
argc -= optind; argc -= optind;
argv += optind; argv += optind;
rd.show_details = show_details;
rd.json_output = json_output;
rd.pretty_output = pretty_output;
err = rd_init(&rd, argc, argv, filename); err = rd_init(&rd, argc, argv, filename);
if (err) if (err)
goto out; goto out;
rd.show_details = show_details;
err = rd_cmd(&rd); err = rd_cmd(&rd);
out: out:
/* Always cleanup */ /* Always cleanup */

4
rdma/rdma.h
View File

@ -21,6 +21,7 @@
#include "list.h" #include "list.h"
#include "utils.h" #include "utils.h"
#include "json_writer.h"
#define pr_err(args...) fprintf(stderr, ##args) #define pr_err(args...) fprintf(stderr, ##args)
#define pr_out(args...) fprintf(stdout, ##args) #define pr_out(args...) fprintf(stdout, ##args)
@ -46,6 +47,9 @@ struct rd {
struct mnl_socket *nl; struct mnl_socket *nl;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
char *buff; char *buff;
json_writer_t *jw;
bool json_output;
bool pretty_output;
}; };
struct rd_cmd { struct rd_cmd {