From 131f3d9471169f9955255de093ee25bd21fac748 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Mon, 17 Jan 2022 11:48:16 +0100 Subject: [PATCH] proxmox-sys: make some structs serializable we already depend on serde anyway, and this makes gathering structs a bit more comfortable Signed-off-by: Dominik Csapak --- proxmox-sys/Cargo.toml | 1 + proxmox-sys/src/linux/procfs/mod.rs | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/proxmox-sys/Cargo.toml b/proxmox-sys/Cargo.toml index 80d39ebd..bfcd3886 100644 --- a/proxmox-sys/Cargo.toml +++ b/proxmox-sys/Cargo.toml @@ -17,6 +17,7 @@ log = "0.4" nix = "0.19.1" regex = "1.2" serde_json = "1.0" +serde = { version = "1.0", features = [ "derive" ] } zstd = { version = "0.6", features = [ "bindgen" ] } # Macro crates: diff --git a/proxmox-sys/src/linux/procfs/mod.rs b/proxmox-sys/src/linux/procfs/mod.rs index 30b9978b..3373dec0 100644 --- a/proxmox-sys/src/linux/procfs/mod.rs +++ b/proxmox-sys/src/linux/procfs/mod.rs @@ -11,6 +11,7 @@ use std::time::Instant; use anyhow::{bail, format_err, Error}; use lazy_static::lazy_static; use nix::unistd::Pid; +use serde::Serialize; use crate::fs::file_read_firstline; @@ -184,7 +185,7 @@ pub fn read_proc_uptime_ticks() -> Result<(u64, u64), Error> { Ok((up as u64, idle as u64)) } -#[derive(Debug, Default)] +#[derive(Debug, Default, Serialize)] /// The CPU fields from `/proc/stat` with their native time value. Multiply /// with CLOCK_TICKS to get the real value. pub struct ProcFsStat { @@ -407,7 +408,7 @@ fn test_read_proc_stat() { assert_eq!(stat.iowait_percent, 0.0); } -#[derive(Debug)] +#[derive(Debug, Serialize)] pub struct ProcFsMemInfo { pub memtotal: u64, pub memfree: u64, @@ -539,7 +540,7 @@ pub fn read_memory_usage() -> Result { } } -#[derive(Debug)] +#[derive(Debug, Serialize)] pub struct ProcFsNetDev { pub device: String, pub receive: u64,