pollAwaitableResourcesFor now part of IPosixExecutorExtension int…

…erface.
OpenCyphal-Garage · Dec 23, 2024 · 5416290 · 5416290
1 parent ca67bb8
commit 5416290
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/src/common/platform/posix_executor_extension.hpp b/src/common/platform/posix_executor_extension.hpp
@@ -10,6 +10,7 @@
 #include <cetl/pf17/cetlpf.hpp>
 #include <cetl/rtti.hpp>
 #include <libcyphal/executor.hpp>
+#include <libcyphal/transport/errors.hpp>
 
 namespace ocvsmd
 {
@@ -49,6 +50,11 @@ class IPosixExecutorExtension
         libcyphal::IExecutor::Callback::Function&& function,
         const Trigger::Variant&                    trigger) = 0;
 
+    using PollFailure = cetl::variant<libcyphal::transport::PlatformError, libcyphal::ArgumentError>;
+
+    CETL_NODISCARD virtual cetl::optional<PollFailure> pollAwaitableResourcesFor(
+        const cetl::optional<libcyphal::Duration> timeout) const = 0;
+
     // MARK: RTTI
 
     static constexpr cetl::type_id _get_type_id_() noexcept

diff --git a/src/daemon/engine/platform/bsd/kqueue_single_threaded_executor.hpp b/src/daemon/engine/platform/bsd/kqueue_single_threaded_executor.hpp
@@ -69,10 +69,8 @@ class KqueueSingleThreadedExecutor final : public libcyphal::platform::SingleThr
         }
     }
 
-    using PollFailure = cetl::variant<libcyphal::transport::PlatformError, libcyphal::ArgumentError>;
-
     CETL_NODISCARD cetl::optional<PollFailure> pollAwaitableResourcesFor(
-        const cetl::optional<libcyphal::Duration> timeout) const
+        const cetl::optional<libcyphal::Duration> timeout) const override
     {
         CETL_DEBUG_ASSERT((total_awaitables_ > 0) || timeout,
                           "Infinite timeout without awaitables means that we will sleep forever.");

diff --git a/src/daemon/engine/platform/debian/epoll_single_threaded_executor.hpp b/src/daemon/engine/platform/debian/epoll_single_threaded_executor.hpp
@@ -67,10 +67,8 @@ class EpollSingleThreadedExecutor final : public libcyphal::platform::SingleThre
         }
     }
 
-    using PollFailure = cetl::variant<libcyphal::transport::PlatformError, libcyphal::ArgumentError>;
-
     CETL_NODISCARD cetl::optional<PollFailure> pollAwaitableResourcesFor(
-        const cetl::optional<libcyphal::Duration> timeout) const
+        const cetl::optional<libcyphal::Duration> timeout) const override
     {
         CETL_DEBUG_ASSERT((total_awaitables_ > 0) || timeout,
                           "Infinite timeout without awaitables means that we will sleep forever.");

diff --git a/src/daemon/engine/platform/posix_platform_error.hpp b/src/daemon/engine/platform/posix_platform_error.hpp
@@ -36,6 +36,10 @@ class PosixPlatformError final : public libcyphal::transport::IPlatformError
 
     // MARK: IPlatformError
 
+    /// Gets platform-specific error code.
+    ///
+    /// In this case, the error code is the POSIX error code (aka `errno`).
+    ///
     std::uint32_t code() const noexcept override
     {
         return static_cast<std::uint32_t>(code_);