Merge pull request #100 from michaelwoerister/virtual-instead-of-rese…

…rved-string-ids Add API for overriding initial event_id before recording an event and bump version to 0.6.0
rust-lang · Dec 12, 2019 · 2c1ed0d · 2c1ed0d
2 parents 8d2d4fd + 6925f2d
commit 2c1ed0d
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.6.0] - 2019-12-11
+### Added
+- `measureme`: Added `SerializationSink::write_bytes_atomic` that optimizes handling of existing buffers ([GH-97])
+
+### Changed
+- `summarize`: Fixed a crash when incr_cache_load events would have child events ([GH-93])
+- `measureme`: Replaced notion of "reserved" StringIds with simpler "virtual" StringIds ([GH-98])
+
 ## [0.5.0] - 2019-12-02
 ### Added
 - `flamegraph`: new tool that uses the `inferno` crate to generate flamegraph svg files ([GH-73])
@@ -54,3 +62,6 @@
 [GH-84]: https://github.com/rust-lang/measureme/pull/84
 [GH-87]: https://github.com/rust-lang/measureme/pull/87
 [GH-90]: https://github.com/rust-lang/measureme/pull/90
+[GH-93]: https://github.com/rust-lang/measureme/pull/93
+[GH-97]: https://github.com/rust-lang/measureme/pull/97
+[GH-98]: https://github.com/rust-lang/measureme/pull/98
diff --git a/analyzeme/Cargo.toml b/analyzeme/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "analyzeme"
-version = "0.1.0"
+version = "0.6.0"
 authors = ["Wesley Wiser <wwiser@gmail.com>", "Michael Woerister <michaelwoerister@posteo>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/crox/Cargo.toml b/crox/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "crox"
-version = "0.1.0"
+version = "0.6.0"
 authors = ["Wesley Wiser <wwiser@gmail.com>"]
 edition = "2018"
 

diff --git a/flamegraph/Cargo.toml b/flamegraph/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flamegraph"
-version = "0.1.0"
+version = "0.6.0"
 authors = ["Wesley Wiser <wwiser@gmail.com>", "Michael Woerister <michaelwoerister@posteo>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/measureme/Cargo.toml b/measureme/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "measureme"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Wesley Wiser <wwiser@gmail.com>", "Michael Woerister <michaelwoerister@posteo>"]
 edition = "2018"
 description = "Support crate for rustc's self-profiling feature"

diff --git a/measureme/src/profiler.rs b/measureme/src/profiler.rs
@@ -155,3 +155,15 @@ impl<'a, S: SerializationSink> Drop for TimingGuard<'a, S> {
         self.profiler.record_raw_event(&raw_event);
     }
 }
+
+impl<'a, S: SerializationSink> TimingGuard<'a, S> {
+
+    /// This method set a new `event_id` right before actually recording the
+    /// event.
+    #[inline]
+    pub fn finish_with_override_event_id(mut self, event_id: StringId) {
+        self.event_id = event_id;
+        // Let's be explicit about it: Dropping the guard will record the event.
+        drop(self)
+    }
+}
diff --git a/mmview/Cargo.toml b/mmview/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mmview"
-version = "0.1.0"
+version = "0.6.0"
 authors = ["Wesley Wiser <wwiser@gmail.com>", "Michael Woerister <michaelwoerister@posteo>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/stack_collapse/Cargo.toml b/stack_collapse/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stack_collapse"
-version = "0.1.0"
+version = "0.6.0"
 authors = ["Wesley Wiser <wwiser@gmail.com>", "Michael Woerister <michaelwoerister@posteo>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/summarize/Cargo.toml b/summarize/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "summarize"
-version = "0.1.0"
+version = "0.6.0"
 authors = ["Wesley Wiser <wwiser@gmail.com>", "Michael Woerister <michaelwoerister@posteo>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"