Rework the CLI list command

3XX0 · 3XX0 · commit d4ee21681385 · 2017-12-14T19:18:09.000-08:00
diff --git a/src/cli/cli.h b/src/cli/cli.h
@@ -22,22 +22,28 @@ struct command {
 };
 
 struct context {
+        /* main */
         uid_t uid;
         gid_t gid;
+        bool load_kmods;
+        char *init_flags;
+        const struct command *command;
+
+        /* configure */
         pid_t pid;
         char *rootfs;
-        char *devices;
         char *reqs[32];
         size_t nreqs;
         char *ldconfig;
-        bool load_kmods;
-        bool list_info;
-        char *init_flags;
-        char *driver_flags;
-        char *device_flags;
         char *container_flags;
 
-        const struct command *command;
+        /* list */
+        bool compat32;
+        bool list_bins;
+        bool list_libs;
+        bool list_ipcs;
+
+        char *devices;
 };
 
 int select_devices(struct error *, char *, const struct nvc_device *[],
diff --git a/src/cli/configure.c b/src/cli/configure.c
@@ -226,8 +226,8 @@ configure_command(const struct context *ctx)
                 warnx("permission error: %s", err.msg);
                 goto fail;
         }
-        if ((drv = nvc_driver_info_new(nvc, ctx->driver_flags)) == NULL ||
-            (dev = nvc_device_info_new(nvc, ctx->device_flags)) == NULL) {
+        if ((drv = nvc_driver_info_new(nvc, NULL)) == NULL ||
+            (dev = nvc_device_info_new(nvc, NULL)) == NULL) {
                 warnx("detection error: %s", nvc_error(nvc));
                 goto fail;
         }
diff --git a/src/cli/dsl.h b/src/cli/dsl.h
@@ -19,13 +19,13 @@ enum dsl_comparator {
 };
 
 struct dsl_data {
-    struct nvc_driver_info *drv;
-    const struct nvc_device *dev;
+        struct nvc_driver_info *drv;
+        const struct nvc_device *dev;
 };
 
 struct dsl_rule {
-    const char *name;
-    int (*func)(const struct dsl_data *, enum dsl_comparator, const char *);
+        const char *name;
+        int (*func)(const struct dsl_data *, enum dsl_comparator, const char *);
 };
 
 int dsl_compare_version(const char *, enum dsl_comparator, const char *);
diff --git a/src/cli/list.c b/src/cli/list.c
@@ -13,18 +13,16 @@ static error_t list_parser(int, char *, struct argp_state *);
 const struct argp list_usage = {
         (const struct argp_option[]){
                 {NULL, 0, NULL, 0, "Options:", -1},
-                {"info", 'i', NULL, 0, "List driver version information", -1},
                 {"device", 'd', "ID", 0, "Device UUID(s) or index(es) to list", -1},
-                {"compute", 'c', NULL, 0, "List compute components", -1},
-                {"utility", 'u', NULL, 0, "List utility components", -1},
-                {"video", 'v', NULL, 0, "List video components", -1},
-                {"graphics", 'g', NULL, 0, "List graphics components", -1},
-                {"compat32", 0x80, NULL, 0, "List 32bits components", -1},
+                {"libraries", 'l', NULL, 0, "List driver libraries", -1},
+                {"binaries", 'b', NULL, 0, "List driver binaries", -1},
+                {"ipcs", 'i', NULL, 0, "List driver ipcs", -1},
+                {"compat32", 0x80, NULL, 0, "Enable 32bits compatibility", -1},
                 {0},
         },
         list_parser,
         NULL,
-        "Query the host driver and list the components required in order to configure a container with GPU support.",
+        "Query the driver and list the components required in order to configure a container with GPU support.",
         NULL,
         NULL,
         NULL,
@@ -37,32 +35,31 @@ list_parser(int key, char *arg, struct argp_state *state)
         struct error err = {0};
 
         switch (key) {
-        case 'i':
-                ctx->list_info = true;
-                break;
         case 'd':
                 if (strjoin(&err, &ctx->devices, arg, ",") < 0)
                         goto fatal;
                 break;
-        case 'c':
-                if (strjoin(&err, &ctx->container_flags, "compute", " ") < 0)
-                        goto fatal;
+        case 'l':
+                ctx->list_libs = true;
                 break;
-        case 'u':
-                if (strjoin(&err, &ctx->container_flags, "utility", " ") < 0)
-                        goto fatal;
+        case 'b':
+                ctx->list_bins = true;
                 break;
-        case 'v':
-                if (strjoin(&err, &ctx->container_flags, "video", " ") < 0)
-                        goto fatal;
-                break;
-        case 'g':
-                if (strjoin(&err, &ctx->container_flags, "graphics", " ") < 0)
-                        goto fatal;
+        case 'i':
+                ctx->list_ipcs = true;
                 break;
         case 0x80:
-                if (strjoin(&err, &ctx->container_flags, "compat32", " ") < 0)
-                        goto fatal;
+                ctx->compat32 = true;
+                break;
+        case ARGP_KEY_END:
+                if (state->argc == 1) {
+                        if ((ctx->devices = xstrdup(&err, "all")) == NULL)
+                                goto fatal;
+                        ctx->compat32 = true;
+                        ctx->list_libs = true;
+                        ctx->list_bins = true;
+                        ctx->list_ipcs = true;
+                }
                 break;
         default:
                 return (ARGP_ERR_UNKNOWN);
@@ -128,18 +125,12 @@ list_command(const struct context *ctx)
                 warnx("permission error: %s", err.msg);
                 goto fail;
         }
-        if ((drv = nvc_driver_info_new(nvc, ctx->driver_flags)) == NULL ||
-            (dev = nvc_device_info_new(nvc, ctx->device_flags)) == NULL) {
+        if ((drv = nvc_driver_info_new(nvc, NULL)) == NULL ||
+            (dev = nvc_device_info_new(nvc, NULL)) == NULL) {
                 warnx("detection error: %s", nvc_error(nvc));
                 goto fail;
         }
 
-        /* List the driver information. */
-        if (ctx->list_info) {
-                printf("NVRM version: %s\n", drv->nvrm_version);
-                printf("CUDA version: %s\n", drv->cuda_version);
-        }
-
         /* List the visible GPU devices. */
         if (dev->ngpus > 0) {
                 gpus = alloca(dev->ngpus * sizeof(*gpus));
@@ -159,14 +150,22 @@ list_command(const struct context *ctx)
         }
 
         /* List the driver components */
-        for (size_t i = 0; i < drv->nbins; ++i)
-                printf("%s\n", drv->bins[i]);
-        for (size_t i = 0; i < drv->nlibs; ++i)
-                printf("%s\n", drv->libs[i]);
-        for (size_t i = 0; i < drv->nlibs32; ++i)
-                printf("%s\n", drv->libs32[i]);
-        for (size_t i = 0; i < drv->nipcs; ++i)
-                printf("%s\n", drv->ipcs[i]);
+        if (ctx->list_bins) {
+                for (size_t i = 0; i < drv->nbins; ++i)
+                        printf("%s\n", drv->bins[i]);
+        }
+        if (ctx->list_libs) {
+                for (size_t i = 0; i < drv->nlibs; ++i)
+                        printf("%s\n", drv->libs[i]);
+                if (ctx->compat32) {
+                        for (size_t i = 0; i < drv->nlibs32; ++i)
+                                printf("%s\n", drv->libs32[i]);
+                }
+        }
+        if (ctx->list_ipcs) {
+                for (size_t i = 0; i < drv->nipcs; ++i)
+                        printf("%s\n", drv->ipcs[i]);
+        }
 
         if (run_as_root && perm_set_capabilities(&err, CAP_EFFECTIVE, effective_caps[CAPS_SHUTDOWN], effective_caps_size(CAPS_SHUTDOWN)) < 0) {
                 warnx("permission error: %s", err.msg);
diff --git a/src/cli/main.c b/src/cli/main.c
@@ -30,7 +30,7 @@ static struct argp usage = {
                 {"load-kmods", 'k', NULL, 0, "Load kernel modules", -1},
                 {"user", 'u', "UID[:GID]", OPTION_ARG_OPTIONAL, "User and group to use for privilege separation", -1},
                 {NULL, 0, NULL, 0, "Commands:", 0},
-                {"list", 0, NULL, OPTION_DOC|OPTION_NO_USAGE, "List host driver components", 0},
+                {"list", 0, NULL, OPTION_DOC|OPTION_NO_USAGE, "List driver components", 0},
                 {"configure", 0, NULL, OPTION_DOC|OPTION_NO_USAGE, "Configure a container with GPU support", 0},
                 {0},
         },
@@ -126,8 +126,6 @@ main(int argc, char *argv[])
 
         free(ctx.devices);
         free(ctx.init_flags);
-        free(ctx.driver_flags);
-        free(ctx.device_flags);
         free(ctx.container_flags);
         return (rv);
 }

Original file line number	Diff line number	Diff line change
`@@ -226,8 +226,8 @@ configure_command(const struct context *ctx)`
`226`	`226`	`warnx("permission error: %s", err.msg);`
`227`	`227`	`goto fail;`
`228`	`228`	`}`
`229`		`- if ((drv = nvc_driver_info_new(nvc, ctx->driver_flags)) == NULL \|\|`
`230`		`- (dev = nvc_device_info_new(nvc, ctx->device_flags)) == NULL) {`
	`229`	`+ if ((drv = nvc_driver_info_new(nvc, NULL)) == NULL \|\|`
	`230`	`+ (dev = nvc_device_info_new(nvc, NULL)) == NULL) {`
`231`	`231`	`warnx("detection error: %s", nvc_error(nvc));`
`232`	`232`	`goto fail;`
`233`	`233`	`}`