Add manufacturer to GPU output

Author: Lars T Hansen

src/sysinfo.rs

@@ -28,12 +28,14 @@ fn do_show_system(
     let (model, sockets, cores_per_socket, threads_per_core) = procfs::get_cpu_info(fs)?;
     let mem_by = procfs::get_memtotal_kib(fs)? * 1024;
     let mem_gib = (mem_by as f64 / GIB as f64).round() as i64;
-    let mut cards = match gpu::probe() {
-        Some(device) => match device.get_configuration() {
-            Ok(cards) => cards,
-            Err(_) => vec![],
-        }
-        None => vec![]
+    let (mut cards, manufacturer) = match gpu::probe() {
+        Some(device) =>
+            (match device.get_configuration() {
+                Ok(cards) => cards,
+                Err(_) => vec![],
+            },
+             device.get_manufacturer()),
+        None => (vec![], "UNKNOWN".to_string())
     };
     let hostname = hostname::get();
     let ht = if threads_per_core > 1 {
@@ -98,6 +100,7 @@ fn do_show_system(
                 max_ce_clock_mhz,
                 max_mem_clock_mhz,
             } = c;
+            let manufacturer = util::json_quote(&manufacturer);
             let bus_addr = util::json_quote(bus_addr);
             let model = util::json_quote(model);
             let arch = util::json_quote(arch);
@@ -106,7 +109,7 @@ fn do_show_system(
             gpu_info += &format!(
                 r###"
   {{"bus_addr":"{bus_addr}", "index":{index}, "uuid":"{uuid}",
-   "model":"{model}", "arch":"{arch}", "driver":"{driver}", "firmware":"{firmware}",
+   "manufacturer":"{manufacturer}", "model":"{model}", "arch":"{arch}", "driver":"{driver}", "firmware":"{firmware}",
    "mem_size_kib":{mem_size_kib},
    "power_limit_watt":{power_limit_watt}, "max_power_limit_watt":{max_power_limit_watt}, "min_power_limit_watt":{min_power_limit_watt},
    "max_ce_clock_mhz":{max_ce_clock_mhz}, "max_mem_clock_mhz":{max_mem_clock_mhz}}}"###