Skip to content

Commit d0197dd

Browse files
committed
Put a copy of etw-reader inside samply/src/windows.
I forgot to ask Jeff to make me an owner of etw-reader and I'd like to publish.
1 parent 9b6740e commit d0197dd

File tree

17 files changed

+3538
-23
lines changed

17 files changed

+3538
-23
lines changed

Cargo.lock

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samply/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ num-derive = "0.4"
8484
runas = "1.2.0"
8585
which = "7.0.0"
8686
winver = "1"
87-
etw-reader = { path = "../etw-reader" }
87+
88+
# etw-reader = { path = "../etw-reader" }
8889
# linux-perf-data = "0.10.1"
8990

9091
[target.'cfg(windows)'.dependencies.windows]

samply/src/windows/coreclr.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ use std::convert::TryInto;
33
use std::fmt::Display;
44

55
use bitflags::bitflags;
6-
use etw_reader::parser::{Parser, TryParse};
7-
use etw_reader::schema::TypedEvent;
8-
use etw_reader::{self, event_properties_to_string};
96
use fxprof_processed_profile::*;
107
use num_derive::FromPrimitive;
118
use num_traits::FromPrimitive;
@@ -14,6 +11,10 @@ use super::elevated_helper::ElevatedRecordingProps;
1411
use crate::shared::recording_props::{CoreClrProfileProps, ProfileCreationProps};
1512
use crate::windows::profile_context::{KnownCategory, ProfileContext};
1613

14+
use super::etw_reader::event_properties_to_string;
15+
use super::etw_reader::parser::{Parser, TryParse};
16+
use super::etw_reader::schema::TypedEvent;
17+
1718
struct SavedMarkerInfo {
1819
start_timestamp_raw: u64,
1920
name: String,

samply/src/windows/etw_gecko.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ use std::path::{Path, PathBuf};
33
use std::time::Instant;
44

55
use debugid::DebugId;
6-
use etw_reader::parser::{Address, Parser, TryParse};
7-
use etw_reader::schema::SchemaLocator;
8-
use etw_reader::{
9-
add_custom_schemas, event_properties_to_string, open_trace, print_property, GUID,
10-
};
116
use fxprof_processed_profile::debugid;
127
use uuid::Uuid;
138

@@ -16,6 +11,12 @@ use super::profile_context::ProfileContext;
1611
use crate::windows::coreclr;
1712
use crate::windows::profile_context::{KnownCategory, PeInfo};
1813

14+
use super::etw_reader::parser::{Address, Parser, TryParse};
15+
use super::etw_reader::schema::SchemaLocator;
16+
use super::etw_reader::{
17+
add_custom_schemas, event_properties_to_string, open_trace, print_property, GUID,
18+
};
19+
1920
pub fn process_etl_files(
2021
context: &mut ProfileContext,
2122
etl_file: &Path,
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This is a temporary copy of /etw-reader, until the published version
2+
of the crates.io etw-reader reflects what's in this repo.

0 commit comments

Comments
 (0)