Refactor the CLI and split it into multiple files

Author: 3XX0

Makefile

@@ -73,13 +73,16 @@ LIB_RPC_SRCS := $(SRCS_DIR)/driver_rpc.h \
                 $(SRCS_DIR)/driver_svc.c \
                 $(SRCS_DIR)/driver_clt.c
 
-BIN_SRCS     := $(SRCS_DIR)/nvc_cli.c \
+BIN_SRCS     := $(SRCS_DIR)/cli/common.c    \
+                $(SRCS_DIR)/cli/configure.c \
+                $(SRCS_DIR)/cli/dsl.c       \
+                $(SRCS_DIR)/cli/list.c      \
+                $(SRCS_DIR)/cli/main.c      \
                 $(SRCS_DIR)/error_generic.c \
-                $(SRCS_DIR)/dsl.c \
                 $(SRCS_DIR)/utils.c
 
 LIB_SCRIPT   = $(SRCS_DIR)/$(LIB_NAME).lds
-BIN_SCRIPT   = $(SRCS_DIR)/$(BIN_NAME).lds
+BIN_SCRIPT   = $(SRCS_DIR)/cli/$(BIN_NAME).lds
 
 ##### Target definitions #####
 
@@ -147,7 +150,7 @@ LIB_LDLIBS         = $(LIB_LDLIBS_STATIC) $(LIB_LDLIBS_SHARED)
 
 # Binary flags (recursively expanded to handle target-specific flags)
 BIN_CPPFLAGS       = -include $(BUILD_DEFS) $(CPPFLAGS)
-BIN_CFLAGS         = -fPIE -flto $(CFLAGS)
+BIN_CFLAGS         = -I$(SRCS_DIR) -fPIE -flto $(CFLAGS)
 BIN_LDFLAGS        = -L. -pie $(LDFLAGS)
 BIN_LDLIBS         = -l:$(LIB_SHARED) -lcap $(LDLIBS)
 

src/cli/cli.h

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved.
+ */
+
+#ifndef HEADER_CLI_H
+#define HEADER_CLI_H
+
+#include <argp.h>
+#include <stdbool.h>
+#include <unistd.h>
+
+#include "nvc_internal.h"
+
+#include "error_generic.h"
+
+struct context;
+
+struct command {
+        const char *name;
+        const struct argp *argp;
+        int (*func)(const struct context *);
+};
+
+struct context {
+        uid_t uid;
+        gid_t gid;
+        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;
+};
+
+int select_devices(struct error *, char *, const struct nvc_device *[],
+    const struct nvc_device [], size_t);
+
+extern const struct argp list_usage;
+extern const struct argp configure_usage;
+
+int list_command(const struct context *);
+int configure_command(const struct context *);
+
+#endif /* HEADER_CLI_H */

src/cli/common.c

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved.
+ */
+
+#include <inttypes.h>
+#include <string.h>
+
+#include "cli.h"
+
+int
+select_devices(struct error *err, char *devs, const struct nvc_device *selected[],
+    const struct nvc_device available[], size_t size)
+{
+        char *gpu, *ptr;
+        size_t i;
+        uintmax_t n;
+
+        while ((gpu = strsep(&devs, ",")) != NULL) {
+                if (*gpu == '\0')
+                        continue;
+                if (!strcasecmp(gpu, "all")) {
+                        for (i = 0; i < size; ++i)
+                                selected[i] = &available[i];
+                        break;
+                }
+                if (!strncasecmp(gpu, "GPU-", strlen("GPU-")) && strlen(gpu) > strlen("GPU-")) {
+                        for (i = 0; i < size; ++i) {
+                                if (!strncasecmp(available[i].uuid, gpu, strlen(gpu))) {
+                                        selected[i] = &available[i];
+                                        goto next;
+                                }
+                        }
+                } else {
+                        n = strtoumax(gpu, &ptr, 10);
+                        if (*ptr == '\0' && n < UINTMAX_MAX && (size_t)n < size) {
+                                selected[n] = &available[n];
+                                goto next;
+                        }
+                }
+                error_setx(err, "unknown device id: %s", gpu);
+                return (-1);
+         next: ;
+        }
+        return (0);
+}