Merge pull request #119 from nagisa/nagisa/assorted-fixes

Assorted fixes and improvements

Author: wesleywiser

Cargo.toml

@@ -1,11 +1,11 @@
 [workspace]
 
 members = [
+    "analyzeme",
     "crox",
+    "flamegraph",
     "measureme",
     "mmview",
     "stack_collapse",
     "summarize",
-    "analyzeme",
-    "flamegraph",
 ]

analyzeme/src/stringtable.rs

@@ -120,6 +120,8 @@ impl<'st> StringRef<'st> {
                 Some(&addr) => Ok(addr),
                 None => Err(()),
             }
+        } else if self.id == StringId::INVALID {
+            Err(())
         } else {
             Ok(self.id.to_addr())
         }

measureme/src/file_serialization_sink.rs

@@ -17,7 +17,7 @@ struct Inner {
 }
 
 impl SerializationSink for FileSerializationSink {
-    fn from_path(path: &Path) -> Result<Self, Box<dyn Error>> {
+    fn from_path(path: &Path) -> Result<Self, Box<dyn Error + Send + Sync>> {
         fs::create_dir_all(path.parent().unwrap())?;
 
         let file = fs::File::create(path)?;

measureme/src/mmap_serialization_sink.rs

@@ -13,7 +13,7 @@ pub struct MmapSerializationSink {
 }
 
 impl SerializationSink for MmapSerializationSink {
-    fn from_path(path: &Path) -> Result<Self, Box<dyn Error>> {
+    fn from_path(path: &Path) -> Result<Self, Box<dyn Error + Send + Sync>> {
         // Lazily allocate 1 GB :O
         let file_size = 1 << 30;
 

measureme/src/profiler.rs

@@ -15,11 +15,11 @@ pub struct ProfilerFiles {
 }
 
 impl ProfilerFiles {
-    pub fn new(path_stem: &Path) -> ProfilerFiles {
+    pub fn new<P: AsRef<Path>>(path_stem: P) -> ProfilerFiles {
         ProfilerFiles {
-            events_file: path_stem.with_extension("events"),
-            string_data_file: path_stem.with_extension("string_data"),
-            string_index_file: path_stem.with_extension("string_index"),
+            events_file: path_stem.as_ref().with_extension("events"),
+            string_data_file: path_stem.as_ref().with_extension("string_data"),
+            string_index_file: path_stem.as_ref().with_extension("string_index"),
         }
     }
 }
@@ -31,8 +31,9 @@ pub struct Profiler<S: SerializationSink> {
 }
 
 impl<S: SerializationSink> Profiler<S> {
-    pub fn new(path_stem: &Path) -> Result<Profiler<S>, Box<dyn Error>> {
-        let paths = ProfilerFiles::new(path_stem);
+    pub fn new<P: AsRef<Path>>(path_stem: P)
+    -> Result<Profiler<S>, Box<dyn Error + Send + Sync>> {
+        let paths = ProfilerFiles::new(path_stem.as_ref());
         let event_sink = Arc::new(S::from_path(&paths.events_file)?);
 
         // The first thing in every file we generate must be the file header.
@@ -126,8 +127,7 @@ impl<S: SerializationSink> Profiler<S> {
     }
 
     fn nanos_since_start(&self) -> u64 {
-        let duration_since_start = self.start_time.elapsed();
-        duration_since_start.as_secs() * 1_000_000_000 + duration_since_start.subsec_nanos() as u64
+        self.start_time.elapsed().as_nanos() as _
     }
 }
 

measureme/src/serialization.rs

@@ -12,7 +12,7 @@ impl Addr {
 }
 
 pub trait SerializationSink: Sized + Send + Sync + 'static {
-    fn from_path(path: &Path) -> Result<Self, Box<dyn Error>>;
+    fn from_path(path: &Path) -> Result<Self, Box<dyn Error + Send + Sync>>;
 
     /// Atomically write `num_bytes` to the sink. The implementation must ensure
     /// that concurrent invocations of `write_atomic` do not conflict with each
@@ -53,7 +53,7 @@ impl ByteVecSink {
 }
 
 impl SerializationSink for ByteVecSink {
-    fn from_path(_path: &Path) -> Result<Self, Box<dyn Error>> {
+    fn from_path(_path: &Path) -> Result<Self, Box<dyn Error + Send + Sync>> {
         unimplemented!()
     }
 

mmview/src/main.rs

@@ -18,16 +18,17 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     let data = ProfilingData::new(&opt.file_prefix)?;
 
-    let global_start_time = data.iter().map(|e| e.timestamp.start()).min().unwrap();
-
-    for event in data.iter() {
-        if let Some(thread_id) = opt.thread_id {
-            if event.thread_id != thread_id {
-                continue;
+    if let Some(global_start_time) = data.iter().map(|e| e.timestamp.start()).min() {
+        for event in data.iter() {
+            if let Some(thread_id) = opt.thread_id {
+                if event.thread_id != thread_id {
+                    continue;
+                }
             }
+            print_event(&event.to_event(), global_start_time);
         }
-
-        print_event(&event.to_event(), global_start_time);
+    } else {
+        eprintln!("No events.");
     }
 
     Ok(())