Skip to content

[dbsp] Portable thread id for samply. #5928

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
ryzhyk merged 1 commit into from
Mar 26, 2026
+13 −10
Merged

[dbsp] Portable thread id for samply. #5928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions crates/dbsp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ memory-stats = { workspace = true }
serde_json_path_to_error = { workspace = true }
flate2 = { workspace = true }
nix = { workspace = true, features = ["process", "time"] }
thread-id = { workspace = true }

[dev-dependencies]
rand = { workspace = true }
Expand Down
21 changes: 11 additions & 10 deletions crates/dbsp/src/samply.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ use flate2::{
Compression,
bufread::{GzDecoder, GzEncoder},
};
use libc::pid_t;
use nix::{
time::{ClockId, clock_gettime},
unistd::{Pid, gettid},
};
use nix::time::{ClockId, clock_gettime};
use serde::{Deserialize, Serialize};
use serde_json::{Value, json};
use size_of::HumanBytes;
Expand Down Expand Up @@ -234,7 +230,7 @@ impl Drop for SamplySpan {
}

/// Profile marker annotation data.
pub struct Markers(HashMap<Pid, (Option<String>, Vec<Vec<Marker>>)>);
pub struct Markers(HashMap<usize, (Option<String>, Vec<Vec<Marker>>)>);

impl Markers {
/// Calls `f` while capturing profile marker annotation data, and returns
Expand Down Expand Up @@ -363,8 +359,8 @@ impl Markers {
}
for thread in &mut profile.threads {
if let Some(tid) = &thread.tid
&& let Ok(tid) = tid.parse::<pid_t>()
&& let Some((name, markers)) = self.0.get(&Pid::from_raw(tid))
&& let Ok(tid) = tid.parse::<usize>()
&& let Some((name, markers)) = self.0.get(&tid)
{
if let Some(name) = name {
thread.name = Some(name.clone());
Expand Down Expand Up @@ -497,7 +493,7 @@ struct ThreadMarkers {
/// The thread's tid.
///
/// We need this to identify this thread in the profiler file.
tid: Pid,
tid: usize,

/// The thread's name.
///
Expand All @@ -514,8 +510,13 @@ struct ThreadMarkers {

impl ThreadMarkers {
fn new(queue: Arc<Queue>) -> Self {
#[cfg(target_os = "linux")]
let tid = nix::unistd::gettid().as_raw() as usize;
#[cfg(not(target_os = "linux"))]
let tid = thread_id::get();

Self {
tid: gettid(),
tid,
name: std::thread::current().name().map(|s| s.into()),
queue,
}
Expand Down
Loading