Merge pull request #607 from elfenpiff/iox2-605-remove-sigpoll

[#605] remove sigpoll
eclipse-iceoryx · Jan 26, 2025 · d900b9c · d900b9c
2 parents 7593350 + b650ce3
commit d900b9c
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 6 deletions.
diff --git a/doc/release-notes/iceoryx2-unreleased.md b/doc/release-notes/iceoryx2-unreleased.md
@@ -44,6 +44,9 @@
 * Undefined behavior due to ZeroCopyConnection removal when stale resources
     are cleaned up
     [#596](https://github.com/eclipse-iceoryx/iceoryx2/issues/596)
+* Remove `SIGPOLL` that lead to compile issues on older glibc versions.
+    Fixe issue where fatal signals are generated with non-fatal values.
+    [#605](https://github.com/eclipse-iceoryx/iceoryx2/issues/605)
 
 ### Refactoring
 

diff --git a/iceoryx2-bb/posix/src/signal.rs b/iceoryx2-bb/posix/src/signal.rs
@@ -102,7 +102,7 @@ macro_rules! define_signals {
         #[derive(Debug, Clone, Copy, Eq, Hash, PartialEq, Sequence)]
         #[repr(i32)]
         pub enum FatalFetchableSignal {
-          $($fatal_entry = $fatal_nn::$value),*,
+          $($fatal_entry = $fatal_nn::$fatal_value),*,
         }
 
         enum_gen! {
@@ -193,7 +193,6 @@ define_signals! {
     BackgroundProcessReadAttempt = posix::SIGTTIN,
     BackgroundProcessWriteAttempt = posix::SIGTTOU,
     UserDefined1 = posix::SIGUSR1,
-    PollableEvent = posix::SIGPOLL,
     ProfilingTimerExpired = posix::SIGPROF,
     UrgentDataAvailableAtSocket = posix::SIGURG,
     VirtualTimerExpired = posix::SIGVTALRM

diff --git a/iceoryx2-pal/posix/src/freebsd/constants.rs b/iceoryx2-pal/posix/src/freebsd/constants.rs
@@ -53,7 +53,6 @@ pub const PTHREAD_BARRIER_SERIAL_THREAD: int = crate::internal::PTHREAD_BARRIER_
 pub const PTHREAD_EXPLICIT_SCHED: int = crate::internal::PTHREAD_EXPLICIT_SCHED as _;
 pub const PTHREAD_INHERIT_SCHED: int = crate::internal::PTHREAD_INHERIT_SCHED as _;
 
-pub const SIGPOLL: int = crate::internal::SIGIO as _;
 pub const MAX_SIGNAL_VALUE: usize = 34;
 
 pub const SO_PASSCRED: int = crate::internal::LOCAL_PEERCRED as _;

diff --git a/iceoryx2-pal/posix/src/linux/constants.rs b/iceoryx2-pal/posix/src/linux/constants.rs
@@ -53,7 +53,6 @@ pub const PTHREAD_BARRIER_SERIAL_THREAD: int = crate::internal::PTHREAD_BARRIER_
 pub const PTHREAD_EXPLICIT_SCHED: int = crate::internal::PTHREAD_EXPLICIT_SCHED as _;
 pub const PTHREAD_INHERIT_SCHED: int = crate::internal::PTHREAD_INHERIT_SCHED as _;
 
-pub const SIGPOLL: int = crate::internal::SIGPOLL as _;
 pub const MAX_SIGNAL_VALUE: usize = 32;
 
 pub const SO_PASSCRED: int = crate::internal::SO_PASSCRED as _;

diff --git a/iceoryx2-pal/posix/src/macos/constants.rs b/iceoryx2-pal/posix/src/macos/constants.rs
@@ -55,7 +55,6 @@ pub const PTHREAD_BARRIER_SERIAL_THREAD: int = int::MAX;
 pub const PTHREAD_EXPLICIT_SCHED: int = crate::internal::PTHREAD_EXPLICIT_SCHED as _;
 pub const PTHREAD_INHERIT_SCHED: int = crate::internal::PTHREAD_INHERIT_SCHED as _;
 
-pub const SIGPOLL: int = crate::internal::SIGIO as _;
 pub const MAX_SIGNAL_VALUE: usize = 34;
 
 pub const SO_PASSCRED: int = crate::internal::LOCAL_PEERCRED as _;

diff --git a/iceoryx2-pal/posix/src/windows/constants.rs b/iceoryx2-pal/posix/src/windows/constants.rs
@@ -127,7 +127,6 @@ pub const SIGVTALRM: int = 24;
 pub const SIGXCPU: int = 25;
 pub const SIGXFSZ: int = 26;
 pub const SIG_ERR: sighandler_t = sighandler_t::MAX;
-pub const SIGPOLL: int = 27;
 pub const SIG_DFL: int = 0;
 pub const SIG_IGN: int = 1;
 pub const SA_RESTART: int = 1;