send + sync problem

eclipse-zenoh · Nov 4, 2023 · 2c90716 · 2c90716
1 parent 13381dd
commit 2c90716
Show file tree

Hide file tree

Showing 10 changed files with 248 additions and 257 deletions.
diff --git a/plugins/example-plugin/src/lib.rs b/plugins/example-plugin/src/lib.rs
@@ -40,13 +40,13 @@ const DEFAULT_SELECTOR: &str = "demo/example/**";
 impl ZenohPlugin for ExamplePlugin {}
 impl Plugin for ExamplePlugin {
     type StartArgs = Runtime;
-    type RunningPlugin = zenoh::plugins::RunningPlugin;
+    type Instance = zenoh::plugins::RunningPlugin;
 
     // A mandatory const to define, in case of the plugin is built as a standalone executable
     const STATIC_NAME: &'static str = "example";
 
     // The first operation called by zenohd on the plugin
-    fn start(name: &str, runtime: &Self::StartArgs) -> ZResult<Self::RunningPlugin> {
+    fn start(name: &str, runtime: &Self::StartArgs) -> ZResult<Self::Instance> {
         let config = runtime.config().lock();
         let self_cfg = config.plugin(name).unwrap().as_object().unwrap();
         // get the plugin's config details from self_cfg Map (here the "storage-selector" property)

diff --git a/plugins/example-storage-plugin/src/lib.rs b/plugins/example-storage-plugin/src/lib.rs
@@ -31,9 +31,9 @@ zenoh_plugin_trait::declare_plugin!(ExampleBackend);
 
 impl Plugin for ExampleBackend {
     type StartArgs = VolumeConfig;
-    type RunningPlugin = VolumePlugin;
+    type Instance = VolumePlugin;
 
-    fn start(_name: &str, _args: &Self::StartArgs) -> ZResult<Self::RunningPlugin> {
+    fn start(_name: &str, _args: &Self::StartArgs) -> ZResult<Self::Instance> {
         let volume = ExampleBackend {};
         Ok(Box::new(volume))
     }

diff --git a/plugins/zenoh-plugin-rest/src/lib.rs b/plugins/zenoh-plugin-rest/src/lib.rs
@@ -215,7 +215,7 @@ impl ZenohPlugin for RestPlugin {}
 
 impl Plugin for RestPlugin {
     type StartArgs = Runtime;
-    type RunningPlugin = zenoh::plugins::RunningPlugin;
+    type Instance = zenoh::plugins::RunningPlugin;
     const STATIC_NAME: &'static str = "rest";
 
     fn start(name: &str, runtime: &Self::StartArgs) -> ZResult<zenoh::plugins::RunningPlugin> {

diff --git a/plugins/zenoh-plugin-storage-manager/src/lib.rs b/plugins/zenoh-plugin-storage-manager/src/lib.rs
@@ -58,9 +58,9 @@ impl Plugin for StoragesPlugin {
     const STATIC_NAME: &'static str = "storage_manager";
 
     type StartArgs = Runtime;
-    type RunningPlugin = zenoh::plugins::RunningPlugin;
+    type Instance = zenoh::plugins::RunningPlugin;
 
-    fn start(name: &str, runtime: &Self::StartArgs) -> ZResult<Self::RunningPlugin> {
+    fn start(name: &str, runtime: &Self::StartArgs) -> ZResult<Self::Instance> {
         std::mem::drop(env_logger::try_init());
         log::debug!("StorageManager plugin {}", LONG_VERSION.as_str());
         let config =
@@ -109,7 +109,7 @@ impl StorageRuntimeInner {
         let session = Arc::new(zenoh::init(runtime.clone()).res_sync().unwrap());
 
         let plugins_manager = PluginsManager::dynamic(lib_loader.clone(), BACKEND_LIB_PREFIX)
-            .add_static::<MemoryBackend>();
+            .add_static_plugin::<MemoryBackend>();
 
         let mut new_self = StorageRuntimeInner {
             name,
@@ -190,12 +190,12 @@ impl StorageRuntimeInner {
         let volume_id = storage.volume_id.clone();
         let backend = self.plugins_manager.running_plugin(&volume_id)?;
         let storage_name = storage.name.clone();
-        let in_interceptor = backend.running().incoming_data_interceptor();
-        let out_interceptor = backend.running().outgoing_data_interceptor();
+        let in_interceptor = backend.instance().incoming_data_interceptor();
+        let out_interceptor = backend.instance().outgoing_data_interceptor();
         let stopper = async_std::task::block_on(create_and_start_storage(
             admin_key,
             storage,
-            backend.running(),
+            backend.instance(),
             in_interceptor,
             out_interceptor,
             self.session.clone(),
@@ -270,7 +270,7 @@ impl RunningPluginTrait for StorageRuntime {
                     {
                         responses.push(zenoh::plugins::Response::new(
                             key.clone(),
-                            plugin.running().get_admin_status(),
+                            plugin.instance().get_admin_status(),
                         ))
                     }
                 });

diff --git a/plugins/zenoh-plugin-storage-manager/src/memory_backend/mod.rs b/plugins/zenoh-plugin-storage-manager/src/memory_backend/mod.rs
@@ -30,7 +30,7 @@ pub struct MemoryBackend {
 
 impl Plugin for MemoryBackend {
     type StartArgs = VolumeConfig;
-    type RunningPlugin = VolumePlugin;
+    type Instance = VolumePlugin;
 
     const STATIC_NAME: &'static str = MEMORY_BACKEND_NAME;
 

diff --git a/plugins/zenoh-plugin-trait/src/lib.rs b/plugins/zenoh-plugin-trait/src/lib.rs
@@ -51,14 +51,14 @@ pub trait CompatibilityVersion {
 
 pub trait PluginControl {
     fn plugins(&self) -> Vec<&str>;
-    fn status(&self, name: &str) -> PluginStatus;
+    // fn status(&self, name: &str) -> PluginStatus;
 }
 
 pub trait Plugin: Sized + 'static {
     type StartArgs: CompatibilityVersion;
-    type RunningPlugin: CompatibilityVersion;
+    type Instance: CompatibilityVersion;
     /// Your plugins' default name when statically linked.
     const STATIC_NAME: &'static str;
     /// Starts your plugin. Use `Ok` to return your plugin's control structure
-    fn start(name: &str, args: &Self::StartArgs) -> ZResult<Self::RunningPlugin>;
+    fn start(name: &str, args: &Self::StartArgs) -> ZResult<Self::Instance>;
 }