From 1cb785f3847a431e0a013f3d161e16ce61f19a85 Mon Sep 17 00:00:00 2001
From: Sven Erik Jeroschewski <svenerik.jeroschewski@bosch.com>
Date: Fri, 25 Oct 2024 22:00:37 +0200
Subject: [PATCH] removes mutexes from zenoh-kuksa-client

---
 zenoh-kuksa-provider/Cargo.toml               |  3 ---
 zenoh-kuksa-provider/src/main.rs              | 16 ++++++----------
 zenoh-kuksa-provider/src/utils/kuksa_utils.rs | 13 +++++++------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/zenoh-kuksa-provider/Cargo.toml b/zenoh-kuksa-provider/Cargo.toml
index c75adff..cac7683 100644
--- a/zenoh-kuksa-provider/Cargo.toml
+++ b/zenoh-kuksa-provider/Cargo.toml
@@ -11,9 +11,6 @@
 # SPDX-License-Identifier: Apache-2.0
 ########################################################################
 
-
-[workspace]
-
 [package]
 name = "zenoh-kuksa-provider"
 version = "0.1.0"
diff --git a/zenoh-kuksa-provider/src/main.rs b/zenoh-kuksa-provider/src/main.rs
index 4f31248..a51ccd7 100644
--- a/zenoh-kuksa-provider/src/main.rs
+++ b/zenoh-kuksa-provider/src/main.rs
@@ -17,7 +17,6 @@ use provider_config::ProviderConfig;
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::{error::Error, fs};
-use tokio::sync::Mutex;
 
 mod provider_config;
 mod utils;
@@ -51,7 +50,7 @@ async fn handling_zenoh_subscribtion(
     provider_config: Arc<ProviderConfig>,
     session: Arc<Session>,
     metadata_store: MetadataStore,
-    kuksa_client: Arc<Mutex<kuksa::Client>>,
+    mut kuksa_client: kuksa::Client,
 ) {
     info!("Listening on selector: {:?}", provider_config.zenoh.key_exp);
 
@@ -77,13 +76,11 @@ async fn handling_zenoh_subscribtion(
         if field_type == "currentValue" {
             let datapoint_update = new_datapoint_for_update(&vss_path, &sample, &store);
 
-            let mut sub_client = kuksa_client.lock().await;
             debug!("Forwarding: {:#?}", datapoint_update);
-            sub_client
+            kuksa_client
                 .set_current_values(datapoint_update)
                 .await
                 .unwrap();
-            drop(sub_client);
         }
     }
 }
@@ -180,11 +177,11 @@ async fn main() {
 
     let uri = kuksa::Uri::try_from(provider_config.kuksa.databroker_url.as_str())
         .expect("Invalid URI for Kuksa Databroker connection.");
-    let client = Arc::new(Mutex::new(kuksa::Client::new(uri.clone())));
+    let mut client = kuksa::Client::new(uri.clone());
     let actuation_client = kuksa::Client::new(uri);
 
-    fetch_metadata(
-        client.clone(),
+    client = fetch_metadata(
+        client,
         provider_config.signals.iter().map(|s| s as &str).collect(),
         &metadata_store,
     )
@@ -194,8 +191,7 @@ async fn main() {
         let session = Arc::clone(&zenoh_session);
         let provider_config = Arc::clone(&provider_config);
         let metadata_store = Arc::clone(&metadata_store);
-        let kuksa_client = Arc::clone(&client);
-        handling_zenoh_subscribtion(provider_config, session, metadata_store, kuksa_client)
+        handling_zenoh_subscribtion(provider_config, session, metadata_store, client)
     });
 
     let publisher_handle = tokio::spawn({
diff --git a/zenoh-kuksa-provider/src/utils/kuksa_utils.rs b/zenoh-kuksa-provider/src/utils/kuksa_utils.rs
index b6b75d0..a3d29c9 100644
--- a/zenoh-kuksa-provider/src/utils/kuksa_utils.rs
+++ b/zenoh-kuksa-provider/src/utils/kuksa_utils.rs
@@ -12,24 +12,23 @@
  ********************************************************************************/
 
 use kuksa::proto::v1::{datapoint::Value, DataType, Datapoint};
+use kuksa::Client;
 use log::warn;
 use prost_types::Timestamp;
 use std::time::{SystemTime, UNIX_EPOCH};
-use std::{collections::HashMap, sync::Arc};
-use tokio::sync::Mutex;
+use std::collections::HashMap;
 use zenoh::{buffers::ZBuf, sample::Sample};
 
 use crate::utils::{metadata_store::MetadataInfo, zenoh_utils::zbuf_to_string};
 
 pub async fn fetch_metadata(
-    kuksa_client: Arc<Mutex<kuksa::Client>>,
+    mut kuksa_client: Client,
     paths: Vec<&str>,
     metadata_store: &super::metadata_store::MetadataStore,
-) {
-    let mut client = kuksa_client.lock().await;
+) -> Client {
     let mut store = metadata_store.lock().await;
 
-    let data_entries: Vec<kuksa::DataEntry> = client.get_metadata(paths).await.unwrap();
+    let data_entries: Vec<kuksa::DataEntry> = kuksa_client.get_metadata(paths).await.unwrap();
 
     for entry in data_entries {
         store.insert(
@@ -40,6 +39,8 @@ pub async fn fetch_metadata(
             },
         );
     }
+
+    kuksa_client
 }
 
 pub fn new_datapoint(data_type: &DataType, payload: &ZBuf) -> Datapoint {