Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 186 additions & 4 deletions Cargo.lock

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

7 changes: 7 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ sysctl = "*"
perf-event2 = "0.7.2"
procfs = "0.12.0"
timerfd = "1.6.0"
linux-perf-data = "0.12"
linux-perf-event-reader = "0.10"
object = { version = "0.36", features = ["read"] }
cpp_demangle = "0.5"
rustc-demangle = "0.1"
gimli = { version = "0.33", default-features = false, features = ["read-core", "endian-reader"] }
lzma-rs = "0.3"

[features]
default = []
Expand Down
4 changes: 2 additions & 2 deletions src/data/common/data_formats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,10 @@ impl Default for Profiler {
}

impl Profiler {
pub fn new(start_time_ms: i64, block_width_ms: u64) -> Self {
pub fn new(start_time_ms: i64) -> Self {
Profiler {
start_time_ms,
block_width_ms,
block_width_ms: BUCKET_WIDTH_MS,
metadata: KeyValueData::default(),
profiles: HashMap::new(),
}
Expand Down
4 changes: 2 additions & 2 deletions src/data/java_profile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::data::common::data_formats::{AperfData, Profiler, ProfilingData};
#[cfg(target_os = "linux")]
use crate::data::common::utils::get_data_name_from_type;
use crate::data::{Data, ProcessData};
use crate::profiling::{jfr, Profile, ProfileGraph, BUCKET_WIDTH_MS};
use crate::profiling::{jfr, Profile, ProfileGraph};
use crate::visualizer::ReportParams;
use anyhow::Result;
use log::error;
Expand Down Expand Up @@ -343,7 +343,7 @@ impl CollectData for JavaProfileRaw {
"{}-java-profile-{}-profiler-data.json",
params.run_name, key
));
match jfr::jfr_to_profiler(&jfr_path, BUCKET_WIDTH_MS) {
match jfr::jfr_to_profiler(&jfr_path) {
Ok(mut profiler) => {
profiler.metadata = jfr::parse_jfr_metadata(&metadata_json);
if let Ok(json) = serde_json::to_string(&profiler) {
Expand Down
Loading
Loading