shm examples fixed

eclipse-zenoh · Apr 25, 2024 · 19be246 · 19be246
1 parent dd6720d
commit 19be246
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 21 deletions.
diff --git a/examples/examples/z_alloc_shm.rs b/examples/examples/z_alloc_shm.rs
@@ -12,14 +12,6 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 use zenoh::prelude::r#async::*;
-use zenoh::shm::protocol_implementations::posix::posix_shared_memory_provider_backend::PosixSharedMemoryProviderBackend;
-use zenoh::shm::protocol_implementations::posix::protocol_id::POSIX_PROTOCOL_ID;
-use zenoh::shm::provider::shared_memory_provider::{
-    BlockOn, GarbageCollect, SharedMemoryProviderBuilder,
-};
-use zenoh::shm::provider::shared_memory_provider::{Deallocate, Defragment};
-use zenoh::shm::provider::types::{AllocAlignment, MemoryLayout};
-use zenoh::Result;
 
 #[tokio::main]
 async fn main() {
@@ -28,7 +20,7 @@ async fn main() {
     run().await.unwrap()
 }
 
-async fn run() -> Result<()> {
+async fn run() -> ZResult<()> {
     // Construct an SHM backend
     let backend = {
         // NOTE: code in this block is a specific PosixSharedMemoryProviderBackend API.

diff --git a/examples/examples/z_ping_shm.rs b/examples/examples/z_ping_shm.rs
@@ -13,17 +13,7 @@
 //
 use clap::Parser;
 use std::time::{Duration, Instant};
-use zenoh::buffers::ZSlice;
-use zenoh::config::Config;
 use zenoh::prelude::sync::*;
-use zenoh::publication::CongestionControl;
-use zenoh::shm::protocol_implementations::posix::{
-    posix_shared_memory_provider_backend::PosixSharedMemoryProviderBackend,
-    protocol_id::POSIX_PROTOCOL_ID,
-};
-use zenoh::shm::provider::shared_memory_provider::SharedMemoryProviderBuilder;
-use zenoh::shm::provider::types::AllocAlignment;
-use zenoh::shm::provider::types::MemoryLayout;
 use zenoh_examples::CommonArgs;
 
 fn main() {

diff --git a/examples/examples/z_pub_shm.rs b/examples/examples/z_pub_shm.rs
@@ -12,7 +12,6 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 use clap::Parser;
-use std::time::Duration;
 use zenoh::prelude::r#async::*;
 use zenoh_examples::CommonArgs;
 

diff --git a/examples/examples/z_sub_shm.rs b/examples/examples/z_sub_shm.rs
@@ -14,7 +14,6 @@
 use clap::Parser;
 use zenoh::config::Config;
 use zenoh::prelude::r#async::*;
-use zenoh::shm::slice::zsliceshm::zsliceshm;
 use zenoh_examples::CommonArgs;
 
 #[tokio::main]

diff --git a/zenoh/src/lib.rs b/zenoh/src/lib.rs
@@ -365,6 +365,9 @@ pub mod internal {
 pub mod shm {
     pub use zenoh_shm::api::client_storage::SharedMemoryClientStorage;
     pub use zenoh_shm::api::provider::shared_memory_provider::{BlockOn, GarbageCollect};
+    pub use zenoh_shm::api::provider::shared_memory_provider::{Deallocate, Defragment};
+    pub use zenoh_shm::api::provider::types::AllocAlignment;
+    pub use zenoh_shm::api::provider::types::MemoryLayout;
     pub use zenoh_shm::api::slice::zsliceshm::{zsliceshm, ZSliceShm};
     pub use zenoh_shm::api::slice::zsliceshmmut::{zsliceshmmut, ZSliceShmMut};
     pub use zenoh_shm::api::{