cli: add info command

Author: doums

build.zig.zon

@@ -1,6 +1,6 @@
 .{
     .name = .nvuv,
-    .version = "0.1.1",
+    .version = "0.1.2",
     .fingerprint = 0x41ef1274ed5bfde3,
     .minimum_zig_version = "0.16.0-dev.3013+abd131e33",
     .dependencies = .{

src/cli.zig

@@ -19,15 +19,17 @@ pub const Command = enum {
     reset,
     cfg,
     applycfg,
+    info,
 };
 
-// for internal use, mapped from SubCommands
+// for internal use, mapped from Commands
 pub const Op = enum {
     query,
     set,
     reset,
     showcfg,
     applycfg,
+    info,
     noop,
 };
 
@@ -37,6 +39,7 @@ pub const Parsed = union(Op) {
     reset: ResetHandler,
     showcfg: ConfigOption,
     applycfg: ConfigOption,
+    info,
     noop,
 };
 
@@ -48,7 +51,6 @@ pub const CliQueryProperty = enum {
     gpu, // all info about a GPU
     gn,
     gpun, // GPUs number
-    driver, // NVIDIA driver version
     ps, // supported P-states list
     pstates,
     psc, // GPU/MEM clocks and offsets
@@ -64,7 +66,6 @@ pub const CliQueryProperty = enum {
         return switch (self) {
             .gpu => .gpu,
             .gn, .gpun => .gpu_num,
-            .driver => .driver,
             .ps, .pstates => .pstates,
             .psc, .pstateclk => .pstate_clock,
             .w, .pl => .power_limit,
@@ -119,6 +120,7 @@ const main_help =
     \\  reset       Reset gpu settings to default (root required)
     \\  cfg         Print config file
     \\  applycfg    Apply settings from config file (root required)
+    \\  info        Print driver, NVML version and detected GPUs
     \\
     \\Options:
     \\  -h, --help       Print help
@@ -188,6 +190,7 @@ pub fn cli(args: std.process.Args, io: std.Io, gpa: std.mem.Allocator) !Parsed {
         .reset => try reset(io, gpa, &iter),
         .cfg => try config_commands(.showcfg, io, gpa, &iter, showcfg_help),
         .applycfg => try config_commands(.applycfg, io, gpa, &iter, applycfg_help),
+        .info => .info,
     };
 }
 
@@ -201,7 +204,6 @@ fn get(io: std.Io, gpa: std.mem.Allocator, iter: *std.process.Args.Iterator) !Pa
         \\  <QUERY>   Possible values:
         \\    gpu               Print gpu info
         \\    gn, gpun          Print the number of gpus present on the system
-        \\    driver            Print NVIDIA driver version
         \\    ps, pstates       Print supported P-states list
         \\    psc, pstateclk    Print all P-states clocks and offsets
         \\    w, pl             Print power limit

src/main.zig

@@ -33,10 +33,10 @@ pub fn main(init: std.process.Init) !void {
     var nvml = try Nvml.init(gpa);
     defer nvml.deinit();
 
-    if (nvml.gpu_count == 0) {
+    if (nvml.gpu_count == 0 and parsed != .info) {
         std.log.warn("no GPU found", .{});
         return;
     }
     const userconf = if (config) |conf| conf.get() else null;
-    try nvml.exec(parsed, userconf);
+    try nvml.dispatch(parsed, userconf);
 }

src/nvml.zig

@@ -62,17 +62,24 @@ pub const Nvml = struct {
         };
     }
 
-    pub fn exec(self: *const Nvml, parsed: Parsed, config: ?UserConfig) !void {
+    pub fn dispatch(self: *const Nvml, parsed: Parsed, config: ?UserConfig) !void {
         switch (parsed) {
             .query => |handler| {
-                try handler.run(self.gpus, self.driver_version);
+                try handler.run(self.gpus);
             },
             .set => |handler| {
                 try handler.run(self.gpus);
             },
             .reset => |handler| {
                 try handler.run(self.gpus);
             },
+            .info => {
+                std.debug.print("NVIDIA driver: {s}\n", .{self.driver_version});
+                std.debug.print("NVML version: {s}\n", .{self.nvml_version});
+                for (self.gpus) |gpu| {
+                    std.debug.print("GPU{d}: {s}\n", .{ gpu.index, gpu.name });
+                }
+            },
             .applycfg => {
                 const conf = config orelse {
                     std.log.warn("no config to apply", .{});

src/query.zig

@@ -7,7 +7,6 @@ const Gpu = @import("gpu.zig").Gpu;
 pub const Query = enum {
     gpu, // all info about a GPU
     gpu_num, // GPUs number
-    driver, // NVIDIA driver version
     pstates, // supported P-states list
     pstate_clock, // GPU/MEM clocks and offsets
     power_limit,
@@ -22,7 +21,7 @@ pub const QueryHandler = struct {
     gpu: ?u16,
     pstate: ?u16,
 
-    pub fn run(self: QueryHandler, gpus: []const Gpu, driver: []const u8) !void {
+    pub fn run(self: QueryHandler, gpus: []const Gpu) !void {
         if (gpus.len == 0) unreachable;
 
         const index = self.gpu orelse 0;
@@ -35,7 +34,6 @@ pub const QueryHandler = struct {
         switch (self.query) {
             .gpu => gpus[index].print(),
             .gpu_num => std.debug.print("GPU count: {d}\n", .{gpus.len}),
-            .driver => std.debug.print("NVIDIA driver: {s}\n", .{driver}),
             .pstates => gpus[index].printSupportedPStates(),
             .pstate_clock => try gpus[index].printPStateClocks(self.pstate),
             .power_limit => gpu.printPowerLimit(),