Merge branch 'main' into next

[mirror_iproute2.git] / rdma / rdma.c

diff --git a/rdma/rdma.c b/rdma/rdma.c
index b43e5385ad0a43e4c65ff2d173cc9a49b1004f50..8dc2d3e344be288f00e8f28b78a35826eac3ed3e 100644 (file)
--- a/rdma/rdma.c
+++ b/rdma/rdma.c
@@ -1,23 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
 /*
  * rdma.c      RDMA tool
- *
- *              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:     Leon Romanovsky <leonro@mellanox.com>
  */
 
 #include "rdma.h"
-#include "SNAPSHOT.h"
+#include "version.h"
+#include "color.h"
 
 static void help(char *name)
 {
        pr_out("Usage: %s [ OPTIONS ] OBJECT { COMMAND | help }\n"
               "       %s [ -f[orce] ] -b[atch] filename\n"
-              "where  OBJECT := { dev | link | resource | help }\n"
-              "       OPTIONS := { -V[ersion] | -d[etails] | -j[son] | -p[retty]}\n", name, name);
+              "where  OBJECT := { dev | link | resource | system | statistic | help }\n"
+              "       OPTIONS := { -V[ersion] | -d[etails] | -j[son] | -p[retty] -r[aw]}\n", name, name);
 }
 
 static int cmd_help(struct rd *rd)
@@ -34,6 +30,8 @@ static int rd_cmd(struct rd *rd, int argc, char **argv)
                { "dev",        cmd_dev },
                { "link",       cmd_link },
                { "resource",   cmd_res },
+               { "system",     cmd_sys },
+               { "statistic",  cmd_stat },
                { 0 }
        };
 
@@ -43,40 +41,16 @@ static int rd_cmd(struct rd *rd, int argc, char **argv)
        return rd_exec_cmd(rd, cmds, "object");
 }
 
-static int rd_batch(struct rd *rd, const char *name, bool force)
+static int rd_batch_cmd(int argc, char *argv[], void *data)
 {
-       char *line = NULL;
-       size_t len = 0;
-       int ret = 0;
-
-       if (name && strcmp(name, "-") != 0) {
-               if (!freopen(name, "r", stdin)) {
-                       pr_err("Cannot open file \"%s\" for reading: %s\n",
-                              name, strerror(errno));
-                       return errno;
-               }
-       }
-
-       cmdlineno = 0;
-       while (getcmdline(&line, &len, stdin) != -1) {
-               char *largv[512];
-               int largc;
-
-               largc = makeargs(line, largv, ARRAY_SIZE(largv));
-               if (!largc)
-                       continue;       /* blank line */
+       struct rd *rd = data;
 
-               ret = rd_cmd(rd, largc, largv);
-               if (ret) {
-                       pr_err("Command failed %s:%d\n", name, cmdlineno);
-                       if (!force)
-                               break;
-               }
-       }
-
-       free(line);
+       return rd_cmd(rd, argc, argv);
+}
 
-       return ret;
+static int rd_batch(struct rd *rd, const char *name, bool force)
+{
+       return do_batch(name, force, rd_batch_cmd, rd);
 }
 
 static int rd_init(struct rd *rd, char *filename)
@@ -88,15 +62,6 @@ static int rd_init(struct rd *rd, char *filename)
        INIT_LIST_HEAD(&rd->dev_map_list);
        INIT_LIST_HEAD(&rd->filter_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);
        if (!rd->buff)
                return -ENOMEM;
@@ -112,8 +77,6 @@ static int rd_init(struct rd *rd, char *filename)
 
 static void rd_cleanup(struct rd *rd)
 {
-       if (rd->json_output)
-               jsonw_destroy(&rd->jw);
        rd_free(rd);
 }
 
@@ -125,37 +88,44 @@ int main(int argc, char **argv)
                { "json",               no_argument,            NULL, 'j' },
                { "pretty",             no_argument,            NULL, 'p' },
                { "details",            no_argument,            NULL, 'd' },
+               { "raw",                no_argument,            NULL, 'r' },
                { "force",              no_argument,            NULL, 'f' },
                { "batch",              required_argument,      NULL, 'b' },
                { NULL, 0, NULL, 0 }
        };
+       bool show_driver_details = false;
        const char *batch_file = NULL;
-       bool pretty_output = false;
        bool show_details = false;
        bool json_output = false;
+       bool show_raw = false;
        bool force = false;
-       char *filename;
        struct rd rd = {};
+       char *filename;
        int opt;
        int err;
-
        filename = basename(argv[0]);
 
-       while ((opt = getopt_long(argc, argv, ":Vhdpjfb:",
+       while ((opt = getopt_long(argc, argv, ":Vhdrpjfb:",
                                  long_options, NULL)) >= 0) {
                switch (opt) {
                case 'V':
-                       printf("%s utility, iproute2-ss%s\n",
-                              filename, SNAPSHOT);
+                       printf("%s utility, iproute2-%s\n",
+                              filename, version);
                        return EXIT_SUCCESS;
                case 'p':
-                       pretty_output = true;
+                       pretty = 1;
                        break;
                case 'd':
-                       show_details = true;
+                       if (show_details)
+                               show_driver_details = true;
+                       else
+                               show_details = true;
+                       break;
+               case 'r':
+                       show_raw = true;
                        break;
                case 'j':
-                       json_output = true;
+                       json_output = 1;
                        break;
                case 'f':
                        force = true;
@@ -180,8 +150,10 @@ int main(int argc, char **argv)
        argv += optind;
 
        rd.show_details = show_details;
+       rd.show_driver_details = show_driver_details;
        rd.json_output = json_output;
-       rd.pretty_output = pretty_output;
+       rd.pretty_output = pretty;
+       rd.show_raw = show_raw;
 
        err = rd_init(&rd, filename);
        if (err)