laantungir/fips
1
0
Fork 0
mirror of https://github.com/jmcorgan/fips.git synced 2026-07-30 19:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

transport: derive Serialize for EthernetStatsSnapshot

Browse Source 
EthernetStatsSnapshot derived only Clone/Debug/Default, unlike every
other transport's *StatsSnapshot which also derives Serialize. That gap
forced a hand-rolled serde_json::json!{} arm in TransportHandle::
transport_stats() that re-listed all ten fields by hand. Add the
Serialize derive and collapse the arm to the same one-line
serde_json::to_value(...) form the other transports use. The emitted
JSON keys and values are unchanged.
This commit is contained in:
Johnathan Corgan
2026-07-11 04:27:50 +00:00
parent 8aab71af86
commit a7dfe47663
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/transport/ethernet/stats.rs
+3 -1
View File
@@ -2,6 +2,8 @@
use portable_atomic::{AtomicU64, Ordering}; use portable_atomic::{AtomicU64, Ordering};
use serde::Serialize;
/// Statistics for an Ethernet transport instance. /// Statistics for an Ethernet transport instance.
/// ///
/// Uses atomic counters for lock-free updates from the receive loop /// Uses atomic counters for lock-free updates from the receive loop
@@ -92,7 +94,7 @@ impl Default for EthernetStats {
} }
/// Point-in-time snapshot of Ethernet stats (non-atomic, copyable). /// Point-in-time snapshot of Ethernet stats (non-atomic, copyable).
#[derive(Clone, Debug, Default)] #[derive(Clone, Debug, Default, Serialize)]
pub struct EthernetStatsSnapshot { pub struct EthernetStatsSnapshot {
pub frames_sent: u64, pub frames_sent: u64,
pub frames_recv: u64, pub frames_recv: u64,
src/transport/mod.rs
+1 -13
View File
@@ -1022,19 +1022,7 @@ impl TransportHandle {
} }
#[cfg(unix)] #[cfg(unix)]
TransportHandle::Ethernet(t) => { TransportHandle::Ethernet(t) => {
let snap = t.stats().snapshot(); serde_json::to_value(t.stats().snapshot()).unwrap_or_default()
serde_json::json!({
"frames_sent": snap.frames_sent,
"frames_recv": snap.frames_recv,
"bytes_sent": snap.bytes_sent,
"bytes_recv": snap.bytes_recv,
"send_errors": snap.send_errors,
"recv_errors": snap.recv_errors,
"beacons_sent": snap.beacons_sent,
"beacons_recv": snap.beacons_recv,
"frames_too_short": snap.frames_too_short,
"frames_too_long": snap.frames_too_long,
})
} }
TransportHandle::Tcp(t) => { TransportHandle::Tcp(t) => {
serde_json::to_value(t.stats().snapshot()).unwrap_or_default() serde_json::to_value(t.stats().snapshot()).unwrap_or_default()