bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Upgrade to measureme 9.0.0

Browse source
This commit is contained in:
Wesley Wiser 2020-10-01 08:34:48 -04:00
parent f58ffc9381
commit 5ac5556d63
5 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compiler/rustc_data_structures/src/profiling.rs
View file

@ -94,23 +94,9 @@ use std::process;
use std::sync::Arc;
use std::time::{Duration, Instant};
use measureme::{EventId, EventIdBuilder, SerializableString, StringId};
use measureme::{EventId, EventIdBuilder, Profiler, SerializableString, StringId};
use parking_lot::RwLock;
cfg_if! {
if #[cfg(any(windows, target_os = "wasi"))] {
/// FileSerializationSink is faster on Windows
type SerializationSink = measureme::FileSerializationSink;
} else if #[cfg(target_arch = "wasm32")] {
type SerializationSink = measureme::ByteVecSink;
} else {
/// MmapSerializatioSink is faster on macOS and Linux
type SerializationSink = measureme::MmapSerializationSink;
}
}
type Profiler = measureme::Profiler<SerializationSink>;
bitflags::bitflags! {
struct EventFilter: u32 {
const GENERIC_ACTIVITIES = 1 << 0;
@ -389,7 +375,7 @@ impl SelfProfiler {
output_directory: &Path,
crate_name: Option<&str>,
event_filters: &Option<Vec<String>>,
) -> Result<SelfProfiler, Box<dyn Error>> {
) -> Result<SelfProfiler, Box<dyn Error + Send + Sync>> {
fs::create_dir_all(output_directory)?;
let crate_name = crate_name.unwrap_or("unknown-crate");
@ -500,13 +486,13 @@ impl SelfProfiler {
self.event_filter_mask.contains(EventFilter::QUERY_KEYS)
}
pub fn event_id_builder(&self) -> EventIdBuilder<'_, SerializationSink> {
pub fn event_id_builder(&self) -> EventIdBuilder<'_> {
EventIdBuilder::new(&self.profiler)
}
}
#[must_use]
pub struct TimingGuard<'a>(Option<measureme::TimingGuard<'a, SerializationSink>>);
pub struct TimingGuard<'a>(Option<measureme::TimingGuard<'a>>);
impl<'a> TimingGuard<'a> {
#[inline]