Skip to content

Tag samples with time as close as possible to the time they were taken #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Tag samples with time as close as possible to the time they were taken #128

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acab947
Fix #127: tag samples with time as close as possible to the time they…
vvuk Mar 27, 2024
df24932
fix formatting
vvuk Mar 27, 2024
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
8 changes: 7 additions & 1 deletion samply/src/mac/thread_profiler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ use framehop::FrameAddress;
use fxprof_processed_profile::{CpuDelta, Profile, ThreadHandle, Timestamp};
use mach::mach_types::thread_act_t;
use mach::port::mach_port_t;
use time::get_monotonic_timestamp;

use std::mem;

use crate::mac::time;
use crate::shared::recycling::ThreadRecycler;
use crate::shared::types::{StackFrame, StackMode};
use crate::shared::unresolved_samples::{UnresolvedSamples, UnresolvedStacks};
Expand Down Expand Up @@ -140,6 +142,10 @@ impl ThreadProfiler {
stack_scratch_buffer,
fold_recursive_prefix,
)?;
// make sure to use the time immediately after the stack is sampled so that any
// jitdump records emitted in the interval between samply starting to sample
// all tasks and actually stopping the thread are properly used
let sample_time_mono = get_monotonic_timestamp();

let frames = stack_scratch_buffer.iter().rev().map(|f| match f {
FrameAddress::InstructionPointer(address) => {
Expand All @@ -153,7 +159,7 @@ impl ThreadProfiler {
unresolved_samples.add_sample(
self.profile_thread,
now,
now_mono,
sample_time_mono,
stack,
cpu_delta,
1,
Expand Down