Rename variables and fields relating to self-profiling.

I find these names clearer, esp. for the fields in `MeasureProcessor`.

Author: nnethercote

collector/src/bin/rustc-perf-collector/execute.rs

@@ -310,14 +310,12 @@ pub struct MeasureProcessor {
     base_incr_stats: (Stats, Option<SelfProfile>),
     clean_incr_stats: (Stats, Option<SelfProfile>),
     patched_incr_stats: Vec<(Patch, (Stats, Option<SelfProfile>))>,
-
-    collecting_self_profile: bool,
-
-    should_collect_self_profile: bool,
+    is_first_collection: bool,
+    self_profile: bool,
 }
 
 impl MeasureProcessor {
-    pub fn new(collect_self_profile: bool) -> Self {
+    pub fn new(self_profile: bool) -> Self {
         // Check we have `perf` available.
         let has_perf = Command::new("perf").output().is_ok();
         assert!(has_perf);
@@ -327,28 +325,28 @@ impl MeasureProcessor {
             base_incr_stats: (Stats::new(), None),
             clean_incr_stats: (Stats::new(), None),
             patched_incr_stats: Vec::new(),
-            collecting_self_profile: true,
+            is_first_collection: true,
             // Command::new("summarize").status().is_ok()
-            should_collect_self_profile: collect_self_profile,
+            self_profile,
         }
     }
 }
 
 impl Processor for MeasureProcessor {
     fn profiler(&self) -> Profiler {
-        if self.collecting_self_profile && self.should_collect_self_profile {
+        if self.is_first_collection && self.self_profile {
             Profiler::PerfStatSelfProfile
         } else {
             Profiler::PerfStat
         }
     }
 
     fn start_first_collection(&mut self) {
-        self.collecting_self_profile = true;
+        self.is_first_collection = true;
     }
 
     fn finished_first_collection(&mut self) -> bool {
-        self.collecting_self_profile = false;
+        self.is_first_collection = false;
         true
     }
 

collector/src/bin/rustc-perf-collector/main.rs

@@ -150,7 +150,7 @@ where
 fn process_commits(
     out_repo: outrepo::Repo,
     benchmarks: &[Benchmark],
-    collect_self_profile: bool,
+    self_profile: bool,
 ) -> anyhow::Result<()> {
     println!("processing commits");
     let client = reqwest::Client::new();
@@ -180,7 +180,7 @@ fn process_commits(
                 &benchmarks,
                 3,
                 true,
-                collect_self_profile,
+                self_profile,
             ));
             if let Err(err) = result {
                 panic!("failed to record success: {:?}", err);
@@ -254,7 +254,7 @@ fn bench_commit(
     benchmarks: &[Benchmark],
     iterations: usize,
     call_home: bool,
-    collect_self_profile: bool,
+    self_profile: bool,
 ) -> CommitData {
     info!(
         "benchmarking commit {} ({}) for triple {}",
@@ -285,7 +285,7 @@ fn bench_commit(
     }
 
     let has_measureme = Command::new("summarize").output().is_ok();
-    if collect_self_profile {
+    if self_profile {
         assert!(
             has_measureme,
             "needs `summarize` in PATH for self profile.\n\
@@ -298,7 +298,7 @@ fn bench_commit(
             continue;
         }
 
-        let mut processor = execute::MeasureProcessor::new(collect_self_profile);
+        let mut processor = execute::MeasureProcessor::new(self_profile);
         let result =
             benchmark.measure(&mut processor, build_kinds, run_kinds, compiler, iterations);
         let result = match result {
@@ -455,7 +455,7 @@ fn main_result() -> anyhow::Result<i32> {
     let exclude = matches.value_of("exclude");
     let benchmarks = get_benchmarks(&benchmark_dir, filter, exclude)?;
     let use_remote = matches.is_present("sync_git");
-    let collect_self_profile = matches.is_present("self_profile");
+    let self_profile = matches.is_present("self_profile");
 
     let get_out_dir = || {
         let path = PathBuf::from(matches.value_of_os("output_repo").unwrap());
@@ -483,7 +483,7 @@ fn main_result() -> anyhow::Result<i32> {
                 &benchmarks,
                 3,
                 false,
-                collect_self_profile,
+                self_profile,
             ))?;
             Ok(0)
         }
@@ -523,7 +523,7 @@ fn main_result() -> anyhow::Result<i32> {
                 &benchmarks,
                 1,
                 false,
-                collect_self_profile,
+                self_profile,
             );
             get_out_repo(true)?.add_commit_data(&result)?;
             Ok(0)
@@ -536,7 +536,7 @@ fn main_result() -> anyhow::Result<i32> {
         }
 
         ("process", Some(_)) => {
-            process_commits(get_out_repo(false)?, &benchmarks, collect_self_profile)?;
+            process_commits(get_out_repo(false)?, &benchmarks, self_profile)?;
             Ok(0)
         }
 
@@ -621,7 +621,7 @@ fn main_result() -> anyhow::Result<i32> {
                     &benchmarks,
                     1,
                     false,
-                    collect_self_profile,
+                    self_profile,
                 );
             } else {
                 panic!("no commits");