iox-#23 Use proper error handling for introspection

eclipse-iceoryx · Jun 25, 2022 · 670612c · 670612c
1 parent bf15a0f
commit 670612c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/introspection/memory/ffi.rs b/src/introspection/memory/ffi.rs
@@ -3,6 +3,7 @@
 // SPDX-FileContributor: Mathias Kraus
 
 use crate::sb::{InactiveSubscriber, SubscriberBuilder};
+use crate::IceoryxError;
 
 use std::ffi::CStr;
 use std::marker::PhantomData;
@@ -123,12 +124,11 @@ pub struct MemPoolIntrospectionTopic {
 }
 
 impl MemPoolIntrospectionTopic {
-    pub fn new() -> InactiveSubscriber<Self> {
+    pub fn new() -> Result<InactiveSubscriber<Self>, IceoryxError> {
         SubscriberBuilder::<Self>::new("Introspection", "RouDi_ID", "MemPool")
             .queue_capacity(1)
             .history_request(1)
             .create_without_subscribe()
-            .expect("Create subscriber")
     }
 
     pub fn memory_segments(&self) -> MemorySegmentContainer {

diff --git a/src/introspection/port/ffi.rs b/src/introspection/port/ffi.rs
@@ -3,6 +3,7 @@
 // SPDX-FileContributor: Mathias Kraus
 
 use crate::sb::{InactiveSubscriber, SubscriberBuilder};
+use crate::IceoryxError;
 
 use std::ffi::CStr;
 use std::os::raw::c_char;
@@ -164,12 +165,11 @@ pub struct PortIntrospectionTopic {
 }
 
 impl PortIntrospectionTopic {
-    pub fn new() -> InactiveSubscriber<Self> {
+    pub fn new() -> Result<InactiveSubscriber<Self>, IceoryxError> {
         SubscriberBuilder::<Self>::new("Introspection", "RouDi_ID", "Port")
             .queue_capacity(1)
             .history_request(1)
             .create_without_subscribe()
-            .expect("Create subscriber")
     }
 
     pub fn subscriber_ports(&self) -> SubscriberPortIntrospectionContainer {

diff --git a/src/introspection/process/ffi.rs b/src/introspection/process/ffi.rs
@@ -3,6 +3,7 @@
 // SPDX-FileContributor: Mathias Kraus
 
 use crate::sb::{InactiveSubscriber, SubscriberBuilder};
+use crate::IceoryxError;
 
 use std::ffi::CStr;
 use std::os::raw::c_char;
@@ -60,12 +61,11 @@ pub struct ProcessIntrospectionTopic {
 }
 
 impl ProcessIntrospectionTopic {
-    pub fn new() -> InactiveSubscriber<Self> {
+    pub fn new() -> Result<InactiveSubscriber<Self>, IceoryxError> {
         SubscriberBuilder::<Self>::new("Introspection", "RouDi_ID", "Process")
             .queue_capacity(1)
             .history_request(1)
             .create_without_subscribe()
-            .expect("Create subscriber")
     }
 
     pub fn processes(&self) -> ProcessIntrospectionContainer {