From 7cfad2a402c9d1457eeb79b9f70c3c54d01e788e Mon Sep 17 00:00:00 2001
From: TSnake41 <TSnake@Outlook.fr>
Date: Mon, 31 Jul 2023 15:15:18 +0200
Subject: [PATCH] Try to share XenStore instance.

---
 .../src/watch_cache.rs                        | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/plugins/xcp-metrics-plugin-xenstored/src/watch_cache.rs b/plugins/xcp-metrics-plugin-xenstored/src/watch_cache.rs
index a6f464d..261890f 100644
--- a/plugins/xcp-metrics-plugin-xenstored/src/watch_cache.rs
+++ b/plugins/xcp-metrics-plugin-xenstored/src/watch_cache.rs
@@ -21,12 +21,13 @@ async fn watch_task(
     mut watch_channel: mpsc::UnboundedReceiver<String>,
     mut unwatch_channel: mpsc::UnboundedReceiver<String>,
 ) {
+    let xs = Arc::new(Xs::new(XsOpenFlags::ReadOnly).unwrap());
+
     let watch_task = task::spawn((|| {
         let cache = cache.clone();
+        let xs = xs.clone();
 
         async move {
-            let xs = Xs::new(XsOpenFlags::ReadOnly).unwrap();
-
             let mut stream = xs.get_stream().unwrap();
 
             while let Some(entry) = stream.next().await {
@@ -44,24 +45,28 @@ async fn watch_task(
         }
     })());
 
-    let watch_channel_task = task::spawn(async move {
-        let xs = Xs::new(XsOpenFlags::ReadOnly).unwrap();
+    let watch_channel_task = task::spawn((|| {
+        let xs = xs.clone();
 
-        while let Some(to_watch) = watch_channel.recv().await {
-            println!("Watching {to_watch}");
-            xs.watch(&to_watch, "xcp-metrics-xenstored").ok();
+        async move {
+            while let Some(to_watch) = watch_channel.recv().await {
+                println!("Watching {to_watch}");
+                xs.watch(&to_watch, "xcp-metrics-xenstored").ok();
+            }
         }
-    });
+    })());
 
-    let unwatch_channel_task = task::spawn(async move {
-        let xs = Xs::new(XsOpenFlags::ReadOnly).unwrap();
+    let unwatch_channel_task = task::spawn((|| {
+        let xs = xs.clone();
 
-        while let Some(to_unwatch) = unwatch_channel.recv().await {
-            println!("Unwatching {to_unwatch}");
-            xs.unwatch(&to_unwatch, "xcp-metrics-xenstored").ok();
-            cache.remove(&to_unwatch);
+        async move {
+            while let Some(to_unwatch) = unwatch_channel.recv().await {
+                println!("Unwatching {to_unwatch}");
+                xs.unwatch(&to_unwatch, "xcp-metrics-xenstored").ok();
+                cache.remove(&to_unwatch);
+            }
         }
-    });
+    })());
 
     select! {
         _ = watch_task => {},