Skip to content

Commit

Permalink
Put a copy of etw-reader inside samply/src/windows.
Browse files Browse the repository at this point in the history
I forgot to ask Jeff to make me an owner of etw-reader and
I'd like to publish.
  • Loading branch information
mstange committed Feb 1, 2025
1 parent 57a415e commit b02df6d
Show file tree
Hide file tree
Showing 17 changed files with 3,541 additions and 23 deletions.
14 changes: 0 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion samply/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ num-derive = "0.4"
runas = "1.2.0"
which = "7.0.0"
winver = "1"
etw-reader = { path = "../etw-reader" }

# etw-reader = { path = "../etw-reader" }
# linux-perf-data = "0.10.1"

[target.'cfg(windows)'.dependencies.windows]
Expand Down
7 changes: 4 additions & 3 deletions samply/src/windows/coreclr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ use std::convert::TryInto;
use std::fmt::Display;

use bitflags::bitflags;
use etw_reader::parser::{Parser, TryParse};
use etw_reader::schema::TypedEvent;
use etw_reader::{self, event_properties_to_string};
use fxprof_processed_profile::*;
use num_derive::FromPrimitive;
use num_traits::FromPrimitive;
Expand All @@ -14,6 +11,10 @@ use super::elevated_helper::ElevatedRecordingProps;
use crate::shared::recording_props::{CoreClrProfileProps, ProfileCreationProps};
use crate::windows::profile_context::{KnownCategory, ProfileContext};

use super::etw_reader::parser::{Parser, TryParse};
use super::etw_reader::schema::TypedEvent;
use super::etw_reader::{self, event_properties_to_string};

struct SavedMarkerInfo {
start_timestamp_raw: u64,
name: String,
Expand Down
11 changes: 6 additions & 5 deletions samply/src/windows/etw_gecko.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ use std::path::{Path, PathBuf};
use std::time::Instant;

use debugid::DebugId;
use etw_reader::parser::{Address, Parser, TryParse};
use etw_reader::schema::SchemaLocator;
use etw_reader::{
add_custom_schemas, event_properties_to_string, open_trace, print_property, GUID,
};
use fxprof_processed_profile::debugid;
use uuid::Uuid;

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

use super::etw_reader::parser::{Address, Parser, TryParse};
use super::etw_reader::schema::SchemaLocator;
use super::etw_reader::{
add_custom_schemas, event_properties_to_string, open_trace, print_property, GUID,
};

pub fn process_etl_files(
context: &mut ProfileContext,
etl_file: &Path,
Expand Down
2 changes: 2 additions & 0 deletions samply/src/windows/etw_reader/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This is a temporary copy of /etw-reader, until the published version
of the crates.io etw-reader reflects what's in this repo.
Loading

0 comments on commit b02df6d

Please sign in to comment.