Merge pull request eclipse-iceoryx#271 from elfenpiff/iox2-270-merge-…

…iox2-with-node

[eclipse-iceoryx#270] merge iox2 with node

README.md

@@ -96,7 +96,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
  let publisher = service.publisher_builder().create()?;
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  let sample = publisher.loan_uninit()?;
  let sample = sample.write_payload(1234);
  sample.send()?;
@@ -123,7 +123,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
  let subscriber = service.subscriber_builder().create()?;
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  while let Some(sample) = subscriber.receive()? {
  println!("received: {:?}", *sample);
  }
@@ -172,7 +172,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
  let notifier = event.notifier_builder().create()?;
 
  let id = EventId::new(12);
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  notifier.notify_with_custom_event_id(id)?;
 
  println!("Trigger event with id {:?} ...", id);
@@ -199,7 +199,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
  let listener = event.listener_builder().create()?;
 
- while let Iox2Event::Tick = Iox2::wait(Duration::ZERO) {
+ while let NodeEvent::Tick = node.wait(Duration::ZERO) {
  if let Ok(Some(event_id)) = listener.timed_wait_one(CYCLE_TIME) {
  println!("event was triggered with id: {:?}", event_id);
  }
@@ -226,7 +226,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
  let listener = event.listener_builder().create()?;
 
- while let Iox2Event::Tick = Iox2::wait(Duration::ZERO) {
+ while let NodeEvent::Tick = node.wait(Duration::ZERO) {
  listener.timed_wait_all(
  |event_id| {
  println!("event was triggered with id: {:?}", event_id);

doc/release-notes/iceoryx2-unreleased.md

@@ -76,6 +76,7 @@
  * Updated all dependencies and increased MSRV to 1.75 [#221](https://github.com/eclipse-iceoryx/iceoryx2/issues/221)
  * Remove `Service::does_exist_with_custom_config` and `Service::list_with_custom_config` [#238](https://github.com/eclipse-iceoryx/iceoryx2/issues/238)
  * Renamed `PortFactory::{publisher|subscriber|listener|notifier}` to `PortFactory::{publisher|subscriber|listener|notifier}_builder` [#244](https://github.com/eclipse-iceoryx/iceoryx2/issues/244)
+ * Merged `Iox2::wait` with new `Node` and removed `Iox2` [#270](https://github.com/eclipse-iceoryx/iceoryx2/issues/270)
 
 ### Workflow
 
@@ -355,3 +356,18 @@
  pubsub_service.static_config().max_subscriber();
  ```
 
+17. `Iox2::wait()` is part of the `Node`, `Iox2Event` renamed to `NodeEvent`
+
+ ```rust
+ // old
+ while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ // main loop stuff
+ }
+
+ // new
+ let node = NodeBuilder::new().create::<zero_copy::Service>()?;
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
+ // main loop stuff
+ }
+ ```
+

examples/rust/complex_data_types/complex_data_types.rs

@@ -54,7 +54,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
  let subscriber = service.subscriber_builder().create()?;
  let mut counter = 0;
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  // ComplexDataType as a size of over 30MB, we need to perform a placement new
  // otherwise we will encounter a stack overflow in debug builds.
  // Therefore, we acquire an uninitialized sample, use the PlacementDefault

examples/rust/event/listener.rs

@@ -25,7 +25,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
  let listener = event.listener_builder().create()?;
 
- while let Iox2Event::Tick = Iox2::wait(Duration::ZERO) {
+ while let NodeEvent::Tick = node.wait(Duration::ZERO) {
  if let Ok(Some(event_id)) = listener.timed_wait_one(CYCLE_TIME) {
  println!("event was triggered with id: {:?}", event_id);
  }

examples/rust/event/notifier.rs

@@ -26,7 +26,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
  let notifier = event.notifier_builder().create()?;
 
  let mut counter: usize = 0;
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  counter += 1;
  notifier.notify_with_custom_event_id(EventId::new(counter))?;
 

examples/rust/publish_subscribe/publisher.rs

@@ -28,7 +28,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
  let mut counter: u64 = 0;
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  counter += 1;
  let sample = publisher.loan_uninit()?;
 

examples/rust/publish_subscribe/subscriber.rs

@@ -26,7 +26,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
  let subscriber = service.subscriber_builder().create()?;
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  while let Some(sample) = subscriber.receive()? {
  println!("received: {:?}", *sample);
  }

examples/rust/publish_subscribe_dynamic_data/publisher.rs

@@ -31,7 +31,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
  let mut counter = 1;
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  counter += 1;
 
  let required_memory_size = (8 + counter) % 16;

examples/rust/publish_subscribe_dynamic_data/subscriber.rs

@@ -25,7 +25,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
  let subscriber = service.subscriber_builder().create()?;
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  while let Some(sample) = subscriber.receive()? {
  print!("received {} bytes: ", sample.payload().len());
  for byte in sample.payload() {

examples/rust/publish_subscribe_with_user_header/publisher.rs

@@ -31,7 +31,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
  let mut counter: u64 = 0;
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  counter += 1;
  let mut sample = publisher.loan_uninit()?;
 

examples/rust/publish_subscribe_with_user_header/subscriber.rs

@@ -27,7 +27,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
  let subscriber = service.subscriber_builder().create()?;
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  while let Some(sample) = subscriber.receive()? {
  println!(
  "received: {:?}, user_header: {:?}",

examples/rust/service_attributes/creator.rs

@@ -38,7 +38,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
  println!("{} = {}", attribute.key(), attribute.value());
  }
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  let sample = publisher.loan_uninit()?;
  let sample = sample.write_payload(0);
  sample.send()?;

examples/rust/service_attributes/opener.rs

@@ -33,7 +33,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
  println!("defined service attributes: {:?}", service.attributes());
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  while let Some(sample) = subscriber.receive()? {
  println!("received: {:?}", *sample);
  }

iceoryx2-ffi/ffi/src/publisher.rs

@@ -53,7 +53,7 @@ pub extern "C" fn run_publisher(seconds: u32) -> i32 {
 
  let mut remaining_seconds = seconds;
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  counter += 1;
  let sample = publisher.loan_uninit();
 

iceoryx2-ffi/ffi/src/subscriber.rs

@@ -51,7 +51,7 @@ pub extern "C" fn run_subscriber(seconds: u32) -> i32 {
 
  let mut remaining_seconds = seconds;
 
- while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+ while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
  loop {
  match subscriber.receive() {
  Ok(Some(sample)) => println!("received: {:?}", *sample),

iceoryx2/src/lib.rs

@@ -75,7 +75,7 @@
 //!
 //! let subscriber = service.subscriber_builder().create()?;
 //!
-//! while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+//! while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
 //! while let Some(sample) = subscriber.receive()? {
 //! println!("received: {:?}", *sample);
 //! }
@@ -102,7 +102,7 @@
 //!
 //! let publisher = service.publisher_builder().create()?;
 //!
-//! while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+//! while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
 //! let sample = publisher.loan_uninit()?;
 //! let sample = sample.write_payload(1234);
 //! sample.send()?;
@@ -135,7 +135,7 @@
 //!
 //! let mut listener = event.listener_builder().create()?;
 //!
-//! while let Iox2Event::Tick = Iox2::wait(Duration::ZERO) {
+//! while let NodeEvent::Tick = node.wait(Duration::ZERO) {
 //! if let Ok(Some(event_id)) = listener.timed_wait_one(CYCLE_TIME) {
 //! println!("event was triggered with id: {:?}", event_id);
 //! }
@@ -163,7 +163,7 @@
 //! let notifier = event.notifier_builder().create()?;
 //!
 //! let mut counter: usize = 0;
-//! while let Iox2Event::Tick = Iox2::wait(CYCLE_TIME) {
+//! while let NodeEvent::Tick = node.wait(CYCLE_TIME) {
 //! counter += 1;
 //! notifier.notify_with_custom_event_id(EventId::new(counter))?;
 //!
@@ -289,9 +289,6 @@ mod compiletests;
 /// Handles iceoryx2s global configuration
 pub mod config;
 
-/// Central instance that handles all incoming events, the event loop
-pub mod iox2;
-
 /// Central instance that owns all service entities and can handle incoming event in an event loop
 pub mod node;