Merge branch 'master' into binary_trace_format

Author: nickysn

runtime_tracing/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "runtime_tracing"
-version = "0.10.0"
+version = "0.11.0"
 edition = "2021"
 authors = ["Metacraft Labs Ltd"]
 description = "A library for the schema and tracing helpers for the CodeTracer db trace format"
@@ -13,6 +13,7 @@ build = "build.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+base64 = "0.22.1"
 num-traits = "0.2"
 num-derive = "0.4"
 serde = { version = "1.0", features = ["derive"] }

runtime_tracing/src/base64.rs

@@ -0,0 +1,13 @@
+use base64::Engine;
+use serde::{Deserialize, Serialize};
+use serde::{Deserializer, Serializer};
+
+pub fn serialize<S: Serializer>(v: &Vec<u8>, s: S) -> Result<S::Ok, S::Error> {
+    let base64 = base64::engine::general_purpose::STANDARD.encode(v);
+    String::serialize(&base64, s)
+}
+
+pub fn deserialize<'de, D: Deserializer<'de>>(d: D) -> Result<Vec<u8>, D::Error> {
+    let base64 = String::deserialize(d)?;
+    base64::engine::general_purpose::STANDARD.decode(base64.as_bytes()).map_err(serde::de::Error::custom)
+}

runtime_tracing/src/lib.rs

@@ -10,6 +10,7 @@
 //! The format is documented in `docs/` and the README.
 mod tracer;
 mod types;
+mod base64;
 mod capnptrace;
 pub use crate::tracer::{Tracer, TraceEventsFileFormat, NONE_TYPE_ID, NONE_VALUE};
 pub use crate::types::*;

runtime_tracing/src/tracer.rs

@@ -254,33 +254,29 @@ impl Tracer {
 
     pub fn bind_variable(&mut self, variable_name: &str, place: Place) {
         let variable_id = self.ensure_variable_id(variable_name);
-        self.events.push(TraceLowLevelEvent::BindVariable(crate::BindVariableRecord {
-            variable_id,
-            place,
-        }));
+        self.events
+            .push(TraceLowLevelEvent::BindVariable(crate::BindVariableRecord { variable_id, place }));
     }
 
     pub fn drop_variables(&mut self, variable_names: &[String]) {
-        let variable_ids : Vec<VariableId> = variable_names
+        let variable_ids: Vec<VariableId> = variable_names
             .to_vec()
             .iter()
-            .map(| variable_name | self.ensure_variable_id(variable_name))
+            .map(|variable_name| self.ensure_variable_id(variable_name))
             .collect();
-        self.events.push(TraceLowLevelEvent::DropVariables(
-            variable_ids
-        ))
+        self.events.push(TraceLowLevelEvent::DropVariables(variable_ids))
     }
 
     pub fn simple_rvalue(&mut self, variable_name: &str) -> RValue {
         let variable_id = self.ensure_variable_id(variable_name);
         RValue::Simple(variable_id)
     }
-    
+
     pub fn compound_rvalue(&mut self, variable_dependencies: &[String]) -> RValue {
-        let variable_ids : Vec<VariableId> = variable_dependencies
+        let variable_ids: Vec<VariableId> = variable_dependencies
             .to_vec()
             .iter()
-            .map(| variable_dependency | self.ensure_variable_id(variable_dependency))
+            .map(|variable_dependency| self.ensure_variable_id(variable_dependency))
             .collect();
         RValue::Compound(variable_ids)
     }

runtime_tracing/src/types.rs

@@ -9,6 +9,7 @@ use std::path::PathBuf;
 use num_derive::FromPrimitive;
 use serde::{Deserialize, Serialize};
 use serde_repr::*;
+use crate::base64;
 
 // currently, we do assume that we record the whole program
 // so, we try to include minimal amount of data,
@@ -386,6 +387,12 @@ pub enum ValueRecord {
     Cell {
         place: Place,
     },
+    BigInt {
+        #[serde(with = "base64")]
+        b: Vec<u8>, // Base64 encoded bytes of a big-endian unsigned integer
+        negative: bool,
+        type_id: TypeId,
+    },
 }
 
 /// Categories of types recorded in the trace.