Merge pull request #447 from pythonspeed/sciagraph-multiprocessing

Sciagraph multiprocessing

Author: itamarst

Cargo.lock

@@ -17,6 +17,7 @@ backtrace = "0.3"
 once_cell = "1.15"
 libloading = "0.7"
 libc = "0.2"
+serde = {version = "1", features = ["derive"] }
 
 [dependencies.inferno]
 version = "0.11"

memapi/Cargo.toml

@@ -8,6 +8,8 @@ use super::util::new_hashmap;
 use ahash::RandomState as ARandomState;
 use im::Vector as ImVector;
 use itertools::Itertools;
+use serde::Deserialize;
+use serde::Serialize;
 use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::collections::HashMap;
@@ -17,7 +19,7 @@ extern "C" {
     fn _exit(exit_code: std::os::raw::c_int);
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct FunctionId(u64);
 
 impl FunctionId {
@@ -83,7 +85,7 @@ impl FunctionLocations for VecFunctionLocations {
 pub type LineNumber = u16; // TODO u32, newtype
 
 /// A specific location: file + function + line number.
-#[derive(Clone, Debug, PartialEq, Eq, Copy, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, Copy, Hash, Serialize, Deserialize)]
 pub struct CallSiteId {
     /// The function + filename. We use IDs for performance reasons (faster hashing).
     function: FunctionId,
@@ -101,7 +103,7 @@ impl CallSiteId {
 }
 
 /// The current Python callstack.
-#[derive(Derivative)]
+#[derive(Derivative, Serialize, Deserialize)]
 #[derivative(Clone, PartialEq, Eq, Hash, Debug)]
 pub struct Callstack {
     calls: Vec<CallSiteId>,
@@ -290,11 +292,10 @@ impl CallstackInterner {
 const MIB: usize = 1024 * 1024;
 const HIGH_32BIT: u32 = 1 << 31;
 
-/// A unique identifier for a process. The idea is that each subprocess will be
-/// given a unique identifier from a counter, and that >4 billion processes is
-/// unlikely. But the internal representation can change!
-#[derive(Clone, Copy, Debug, PartialEq, Ord, PartialOrd, Eq)]
-pub struct ProcessUid(u32);
+/// A unique identifier for a process.
+#[derive(Clone, Copy, Debug, PartialEq, Ord, PartialOrd, Eq, Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct ProcessUid(pub u32);
 
 pub const PARENT_PROCESS: ProcessUid = ProcessUid(0);