feat(memtrack): serialize events to allow streamed decoding

Author: not-matthias

crates/runner-shared/src/artifacts/memtrack.rs

@@ -1,13 +1,38 @@
 use libc::pid_t;
 use serde::{Deserialize, Serialize};
+use std::io::Read;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct MemtrackArtifact {
     pub events: Vec<MemtrackEvent>,
 }
-impl super::ArtifactExt for MemtrackArtifact {}
+impl super::ArtifactExt for MemtrackArtifact {
+    fn encode_to_vec(&self) -> Vec<u8> {
+        // This is required for `decode_streamed`:
+        let mut buf = Vec::new();
+        let mut serializer = rmp_serde::Serializer::new(&mut buf);
+        for event in &self.events {
+            event.serialize(&mut serializer).unwrap();
+        }
+        buf
+    }
+}
+
+impl MemtrackArtifact {
+    pub fn decode_streamed<R: std::io::Read>(reader: R) -> anyhow::Result<MemtrackEventStream<R>> {
+        Ok(MemtrackEventStream {
+            deserializer: rmp_serde::Deserializer::new(reader),
+        })
+    }
+
+    pub fn encode_streamed(&self) -> impl Iterator<Item = Vec<u8>> + '_ {
+        self.events
+            .iter()
+            .map(|event| rmp_serde::to_vec_named(event).unwrap())
+    }
+}
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
 pub struct MemtrackEvent {
     pub pid: pid_t,
     pub tid: pid_t,
@@ -17,7 +42,7 @@ pub struct MemtrackEvent {
     pub kind: MemtrackEventKind,
 }
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(tag = "type")]
 pub enum MemtrackEventKind {
     Malloc { size: u64 },
@@ -29,3 +54,54 @@ pub enum MemtrackEventKind {
     Munmap { size: u64 },
     Brk { size: u64 },
 }
+
+pub struct MemtrackEventStream<R: Read> {
+    deserializer: rmp_serde::Deserializer<rmp_serde::decode::ReadReader<R>>,
+}
+
+impl<R: Read> Iterator for MemtrackEventStream<R> {
+    type Item = MemtrackEvent;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        MemtrackEvent::deserialize(&mut self.deserializer).ok()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::artifacts::ArtifactExt;
+
+    use super::*;
+    use std::io::Cursor;
+
+    #[test]
+    fn decode_streamed_reads_until_eof() -> anyhow::Result<()> {
+        let events = vec![
+            MemtrackEvent {
+                pid: 1,
+                tid: 11,
+                timestamp: 100,
+                addr: 0x10,
+                kind: MemtrackEventKind::Malloc { size: 64 },
+            },
+            MemtrackEvent {
+                pid: 1,
+                tid: 12,
+                timestamp: 200,
+                addr: 0x20,
+                kind: MemtrackEventKind::Free,
+            },
+        ];
+
+        let artifact = MemtrackArtifact {
+            events: events.clone(),
+        };
+        let buf = artifact.encode_to_vec();
+
+        let stream = MemtrackArtifact::decode_streamed(Cursor::new(buf))?;
+        let collected: Vec<_> = stream.collect();
+        assert_eq!(collected, events);
+
+        Ok(())
+    }
+}

crates/runner-shared/src/artifacts/mod.rs

@@ -17,14 +17,17 @@ where
         std::any::type_name::<Self>().rsplit("::").next().unwrap()
     }
 
+    fn encode_to_vec(&self) -> Vec<u8> {
+        rmp_serde::to_vec_named(self).expect("Failed to encode type")
+    }
+
     fn save_file_to<P: AsRef<std::path::Path>>(
         &self,
         folder: P,
         filename: &str,
     ) -> anyhow::Result<()> {
         std::fs::create_dir_all(folder.as_ref())?;
-        let data = rmp_serde::to_vec_named(self)?;
-        std::fs::write(folder.as_ref().join(filename), data)?;
+        std::fs::write(folder.as_ref().join(filename), self.encode_to_vec())?;
 
         debug!("Saved {} result to {:?}", Self::name(), folder.as_ref());
         Ok(())