diff options
author | Clement Tsang <34804052+ClementTsang@users.noreply.github.com> | 2020-10-02 22:12:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-02 22:12:07 -0400 |
commit | 5675d8192cbe94d7dbc3370315396a11a3aca02e (patch) | |
tree | f2a067fc3d5154a551f18e365150d67d34a54c6b /src | |
parent | ba7738e73ec46548210b96ddfbf52a2773c31168 (diff) |
other: more traces to debug, update some deps (#264)
Minor update to update some dependencies and remove some traces.
Diffstat (limited to 'src')
-rw-r--r-- | src/app/data_harvester.rs | 11 | ||||
-rw-r--r-- | src/bin/main.rs | 12 | ||||
-rw-r--r-- | src/clap.rs | 1 | ||||
-rw-r--r-- | src/lib.rs | 3 |
4 files changed, 16 insertions, 11 deletions
diff --git a/src/app/data_harvester.rs b/src/app/data_harvester.rs index 285c4823..2e46559a 100644 --- a/src/app/data_harvester.rs +++ b/src/app/data_harvester.rs @@ -94,6 +94,7 @@ pub struct DataCollector { impl Default for DataCollector { fn default() -> Self { + trace!("Creating default data collector..."); DataCollector { data: Data::default(), sys: System::new_all(), @@ -114,13 +115,18 @@ impl Default for DataCollector { battery_manager: None, battery_list: None, #[cfg(target_os = "linux")] - page_file_size_kb: unsafe { libc::sysconf(libc::_SC_PAGESIZE) as u64 / 1024 }, + page_file_size_kb: unsafe { + let page_file_size_kb = libc::sysconf(libc::_SC_PAGESIZE) as u64 / 1024; + trace!("Page file size in KB: {}", page_file_size_kb); + page_file_size_kb + }, } } } impl DataCollector { pub fn init(&mut self) { + trace!("Initializing data collector."); self.mem_total_kb = self.sys.get_total_memory(); trace!("Total memory in KB: {}", self.mem_total_kb); @@ -139,9 +145,10 @@ impl DataCollector { trace!("Running first run."); futures::executor::block_on(self.update_data()); + trace!("First run done. Sleeping for 250ms..."); std::thread::sleep(std::time::Duration::from_millis(250)); - trace!("Running first run cleanup now."); + trace!("First run done. Running first run cleanup now."); self.data.cleanup(); trace!("Enabled widgets to harvest: {:#?}", self.widgets_to_harvest); diff --git a/src/bin/main.rs b/src/bin/main.rs index 1df99ab4..8db05b22 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -79,10 +79,10 @@ fn main() -> Result<()> { // Set up input handling let (sender, receiver) = mpsc::channel(); - let input_thread = create_input_thread(sender.clone(), thread_termination_lock.clone()); + let _input_thread = create_input_thread(sender.clone(), thread_termination_lock.clone()); // Cleaning loop - let cleaning_thread = { + let _cleaning_thread = { let lock = thread_termination_lock.clone(); let cvar = thread_termination_cvar.clone(); let cleaning_sender = sender.clone(); @@ -114,7 +114,7 @@ fn main() -> Result<()> { // Event loop let (collection_thread_ctrl_sender, collection_thread_ctrl_receiver) = mpsc::channel(); - let collection_thread = create_collection_thread( + let _collection_thread = create_collection_thread( sender, collection_thread_ctrl_receiver, thread_termination_lock.clone(), @@ -255,13 +255,9 @@ fn main() -> Result<()> { trace!("Notifying all cvars."); thread_termination_cvar.notify_all(); - cleanup_terminal(&mut terminal, is_debug)?; - trace!("Main/drawing thread is cleaning up."); + cleanup_terminal(&mut terminal, is_debug)?; - cleaning_thread.join().unwrap(); - input_thread.join().unwrap(); - collection_thread.join().unwrap(); trace!("Fini."); Ok(()) } diff --git a/src/clap.rs b/src/clap.rs index b9898198..2a03e9b4 100644 --- a/src/clap.rs +++ b/src/clap.rs @@ -88,6 +88,7 @@ When searching for a process, enables case sensitivity by default.\n\n", "\ Enables debug logging. The program will print where it logged to after running.", ); + // TODO: [DIAGNOSE] Add a diagnose option to help with debugging. let disable_click = Arg::with_name("disable_click") .long("disable_click") .help("Disables mouse clicks.") @@ -624,11 +624,12 @@ pub fn create_collection_thread( thread::spawn(move || { trace!("Spawned collection thread."); let mut data_state = data_harvester::DataCollector::default(); - trace!("Created initial data state."); + trace!("Created default data state."); data_state.set_collected_data(used_widget_set); data_state.set_temperature_type(temp_type); data_state.set_use_current_cpu_total(use_current_cpu_total); data_state.set_show_average_cpu(show_average_cpu); + trace!("Set default data state settings."); data_state.init(); trace!("Data state is now fully initialized."); |