process settings tab messages in a separate thread [CPP-405]

console_backend/Cargo.toml

@@ -42,7 +42,7 @@ minreq = { version = "2.4.2", features = ["https"] }
 regex = { version = "1.5.4" }
 rust-ini = "0.17.0"
 sbp = { version = "4.0.3", features = ["json", "link", "swiftnav"] }
-sbp-settings = "0.4"
+sbp-settings = "0.5.0"
 env_logger = { version = "0.9", optional = true }
 mimalloc = { version = "0.1", default-features = false }
 

console_backend/src/lib.rs

@@ -58,7 +58,7 @@ use crate::{
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
-struct Tabs<'link> {
+struct Tabs {
     pub main: Mutex<MainTab>,
     pub advanced_imu: Mutex<AdvancedImuTab>,
     pub advanced_magnetometer: Mutex<AdvancedMagnetometerTab>,
@@ -73,10 +73,10 @@ struct Tabs<'link> {
     pub advanced_spectrum_analyzer: Mutex<AdvancedSpectrumAnalyzerTab>,
     pub status_bar: Mutex<StatusBar>,
     pub update: Mutex<UpdateTab>,
-    pub settings: Option<SettingsTab<'link>>,
+    pub settings: Option<SettingsTab>,
 }
 
-impl<'link> Tabs<'link> {
+impl Tabs {
     fn new(
         shared_state: shared_state::SharedState,
         client_sender: client_sender::BoxedClientSender,
@@ -130,19 +130,13 @@ impl<'link> Tabs<'link> {
         shared_state: shared_state::SharedState,
         client_sender: client_sender::BoxedClientSender,
         msg_sender: types::MsgSender,
-        link: sbp::link::Link<'link, ()>,
     ) -> Self {
         let mut tabs = Self::new(
             shared_state.clone(),
             client_sender.clone(),
             msg_sender.clone(),
         );
-        tabs.settings = Some(SettingsTab::new(
-            shared_state,
-            client_sender,
-            msg_sender,
-            link,
-        ));
+        tabs.settings = Some(SettingsTab::new(shared_state, client_sender, msg_sender));
         tabs
     }
 }

console_backend/src/process_messages.rs

@@ -46,7 +46,6 @@ pub fn process_messages(
             shared_state.clone(),
             client_sender.clone(),
             msg_sender.clone(),
-            source.stateless_link(),
         )
     } else {
         Tabs::new(
@@ -84,6 +83,9 @@ pub fn process_messages(
         }
         for (message, _) in &mut messages {
             source.send_with_state(&tabs, &message);
+            if let Some(ref tab) = tabs.settings {
+                tab.handle_msg(message);
+            }
             log::logger().flush();
         }
         if let Some(ref tab) = tabs.settings {

console_backend/src/server.rs

@@ -124,7 +124,7 @@ impl Server {
         setup_logging(client_send.clone(), shared_state.clone());
         let opt = CliOptions::from_filtered_cli();
         if let Some(ref path) = opt.settings_yaml {
-            sbp_settings::settings::load_from_path(path).expect("failed to load settings");
+            sbp_settings::setting::load_from_path(path).expect("failed to load settings");
         }
         let conn_manager = ConnectionManager::new(client_send.clone(), shared_state.clone());
         // Handle CLI Opts.