Skip to content

Commit bccaae6

Browse files
committed
Replace --unstable-presymbolicate with --presymbolicate.
1 parent ee8dc03 commit bccaae6

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

‎samply/src/cli.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,13 +324,12 @@ pub struct ProfileCreationArgs {
324324
#[arg(long, default_value = "0", num_args=0..=1, require_equals = true, default_missing_value = "100")]
325325
pub include_args: usize,
326326

327-
/// Emit .syms.json sidecar file containing gathered symbol info for all frames referenced by
328-
/// this profile. With this file along with the profile, samply can load the profile
329-
/// and provide symbols to the front end without needing debug files to be
330-
/// available. (Unstable: will probably change to include the full information
331-
/// in the profile.json, instead of a sidecar file.)
327+
/// Generate a symbolicated profile file by looking up symbol information before writing out the file.
328+
///
329+
/// This is off by default because symbol resolution can take a long time, so
330+
/// the default behavior is to have the front-end apply symbols asynchronously.
332331
#[arg(long)]
333-
pub unstable_presymbolicate: bool,
332+
pub presymbolicate: bool,
334333

335334
/// Emit markers for any unknown ETW events that are encountered.
336335
#[cfg(target_os = "windows")]
@@ -530,7 +529,7 @@ impl ProfileCreationArgs {
530529
create_per_cpu_threads: self.per_cpu_threads,
531530
arg_count_to_include_in_process_name: self.include_args,
532531
override_arch: None,
533-
unstable_presymbolicate: self.unstable_presymbolicate,
532+
presymbolicate: self.presymbolicate,
534533
should_emit_jit_markers: self.jit_markers,
535534
should_emit_cswitch_markers: self.cswitch_markers,
536535
coreclr: self.coreclr_profile_props(),

‎samply/src/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ fn do_import_action(import_args: cli::ImportArgs) {
8888
};
8989

9090
let import_props = import_args.import_props();
91-
let unstable_presymbolicate = import_props.profile_creation_props.unstable_presymbolicate;
91+
let presymbolicate = import_props.profile_creation_props.presymbolicate;
9292
let mut profile = convert_file_to_profile(&input_file, input_path, import_props);
9393

94-
if unstable_presymbolicate {
94+
if presymbolicate {
9595
eprintln!("Symbolicating...");
9696
let symbol_info = crate::shared::presymbolicate::get_presymbolicate_info(
9797
&profile,
@@ -125,7 +125,7 @@ fn do_record_action(record_args: cli::RecordArgs) {
125125
let recording_props = record_args.recording_props();
126126
let recording_mode = record_args.recording_mode();
127127
let profile_creation_props = record_args.profile_creation_props();
128-
let unstable_presymbolicate = profile_creation_props.unstable_presymbolicate;
128+
let presymbolicate = profile_creation_props.presymbolicate;
129129

130130
let (mut profile, exit_status) =
131131
match profiler::run(recording_mode, recording_props, profile_creation_props) {
@@ -136,7 +136,7 @@ fn do_record_action(record_args: cli::RecordArgs) {
136136
}
137137
};
138138

139-
if unstable_presymbolicate {
139+
if presymbolicate {
140140
eprintln!("Symbolicating...");
141141
let symbol_info = crate::shared::presymbolicate::get_presymbolicate_info(
142142
&profile,

‎samply/src/shared/prop_types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ pub struct ProfileCreationProps {
8787
/// Override system architecture.
8888
#[allow(dead_code)]
8989
pub override_arch: Option<String>,
90-
/// Dump presymbolication info.
91-
pub unstable_presymbolicate: bool,
90+
/// Output symbolicated profiles.
91+
pub presymbolicate: bool,
9292
/// CoreCLR specific properties.
9393
#[allow(dead_code)]
9494
pub coreclr: CoreClrProfileProps,

0 commit comments

Comments
 (0)