Rename --merge-threads to --reuse-threads.

Neither name is good. I wanted to move away from --merge-threads because
in the future we might wan to add a feature which merges all threads
(not just non-overlapping threads) into a single output thread.

samply/src/import/perf.rs

@@ -115,7 +115,7 @@ where
         cache,
         extra_dir,
         interpretation.clone(),
-        conversion_props.merge_threads,
+        conversion_props.reuse_threads,
         conversion_props.fold_recursive_prefix,
     );
 

samply/src/linux/profiler.rs

@@ -320,7 +320,7 @@ fn make_converter(
         framehop::CacheNative::new(),
         None,
         interpretation,
-        conversion_props.merge_threads,
+        conversion_props.reuse_threads,
         conversion_props.fold_recursive_prefix,
     )
 }

samply/src/linux_shared/converter.rs

@@ -106,7 +106,7 @@ where
         cache: U::Cache,
         extra_binary_artifact_dir: Option<&Path>,
         interpretation: EventInterpretation,
-        merge_threads: bool,
+        reuse_threads: bool,
         fold_recursive_prefix: bool,
     ) -> Self {
         let interval = match interpretation.sampling_is_time_based {
@@ -138,7 +138,7 @@ where
         Self {
             profile,
             cache,
-            processes: Processes::new(merge_threads),
+            processes: Processes::new(reuse_threads),
             timestamp_converter,
             current_sample_time: first_sample_time,
             build_ids,

samply/src/mac/sampler.rs

@@ -89,7 +89,7 @@ impl Sampler {
                 return Err(SamplingError::CouldNotObtainRootTask);
             }
         };
-        let mut process_recycler = if self.conversion_props.merge_threads {
+        let mut process_recycler = if self.conversion_props.reuse_threads {
             Some(ProcessRecycler::new())
         } else {
             None

samply/src/main.rs

@@ -153,7 +153,7 @@ pub struct ConversionArgs {
 
     /// Merge non-overlapping threads of the same name.
     #[arg(long)]
-    merge_threads: bool,
+    reuse_threads: bool,
 
     /// Fold repeated frames at the base of the stack.
     #[arg(long)]
@@ -224,7 +224,7 @@ impl LoadArgs {
         };
         ConversionProps {
             profile_name,
-            merge_threads: self.conversion_args.merge_threads,
+            reuse_threads: self.conversion_args.reuse_threads,
             fold_recursive_prefix: self.conversion_args.fold_recursive_prefix,
         }
     }
@@ -261,7 +261,7 @@ impl RecordArgs {
         };
         ConversionProps {
             profile_name,
-            merge_threads: self.conversion_args.merge_threads,
+            reuse_threads: self.conversion_args.reuse_threads,
             fold_recursive_prefix: self.conversion_args.fold_recursive_prefix,
         }
     }

samply/src/shared/jit_function_recycler.rs

@@ -2,7 +2,7 @@ use fxprof_processed_profile::LibraryHandle;
 
 use super::types::FastHashMap;
 
-/// When running with --merge-threads, and we run a process multiple times, and each
+/// When running with --reuse-threads, and we run a process multiple times, and each
 /// of that invocations creates similar JIT functions, we want to collapse those "similar"
 /// JIT functions into the same JIT function so that the assembly view shows more hits.
 ///

samply/src/shared/recording_props.rs

@@ -10,7 +10,7 @@ pub struct RecordingProps {
 pub struct ConversionProps {
     pub profile_name: String,
     /// Merge non-overlapping threads of the same name.
-    pub merge_threads: bool,
+    pub reuse_threads: bool,
     /// Fold repeated frames at the base of the stack.
     pub fold_recursive_prefix: bool,
 }