[rust/search] Print search duration from outside the search impl.

cubing · Oct 5, 2023 · 0f52c9a · 0f52c9a
1 parent 45ec7ac
commit 0f52c9a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/rs/cli/main.rs b/src/rs/cli/main.rs
@@ -5,6 +5,7 @@ use std::{
     path::{Path, PathBuf},
     process::exit,
     sync::Arc,
+    time::Instant,
 };
 
 use commands::canonical_algs::canonical_algs;
@@ -170,6 +171,8 @@ fn search(search_command_args: SearchCommandArgs) -> Result<(), CommandError> {
                 .unwrap_or(twsearch::_internal::cli::VerbosityLevel::Error),
         }),
     )?;
+
+    let search_start_time = Instant::now();
     let solutions = idf_search.search(
         &scramble_pattern,
         search_command_args.min_num_solutions.unwrap_or(1),
@@ -184,6 +187,10 @@ fn search(search_command_args: SearchCommandArgs) -> Result<(), CommandError> {
             solution.nodes.len()
         )
     }
+    println!(
+        "// Entire search duration: {:?}",
+        Instant::now() - search_start_time
+    );
 
     Ok(())
 }
diff --git a/src/rs/search/search.rs b/src/rs/search/search.rs
@@ -4,7 +4,6 @@ use std::{
         Arc,
     },
     thread::spawn,
-    time::Instant,
 };
 
 use cubing::alg::{Alg, AlgNode, Move};
@@ -140,7 +139,6 @@ impl IDFSearch {
         search_pattern: &PackedKPattern,
         min_num_solutions: usize,
     ) -> SearchSolutions {
-        let entire_search_start_time = Instant::now();
         let (solution_sender, search_solutions) = SearchSolutions::construct();
         let mut individual_search_data = IndividualSearchData {
             recursive_work_tracker: RecursiveWorkTracker::new(
@@ -176,17 +174,9 @@ impl IDFSearch {
                     .recursive_work_tracker
                     .finish_latest_depth();
                 if let SearchRecursionResult::DoneSearching() = recursion_result {
-                    self.api_data.search_logger.write_info(&format!(
-                        "Entire search duration: {:?}",
-                        Instant::now() - entire_search_start_time
-                    ));
                     return;
                 }
             }
-            self.api_data.search_logger.write_info(&format!(
-                "Entire search duration: {:?}",
-                Instant::now() - entire_search_start_time
-            ));
         });
         search_solutions
     }