Execute Integration Tests on QNX in CI #415
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| # ******************************************************************************* | ||
| # Copyright (c) 2026 Contributors to the Eclipse Foundation | ||
| # | ||
| # See the NOTICE file(s) distributed with this work for additional | ||
| # information regarding copyright ownership. | ||
| # | ||
| # This program and the accompanying materials are made available under the | ||
| # terms of the Apache License Version 2.0 which is available at | ||
| # https://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # ******************************************************************************* | ||
| exports_files(["restore_qnx8_poll_workaround.patch"]) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| diff --git a/score/os/utils/abortable_blocking_reader.cpp b/score/os/utils/abortable_blocking_reader.cpp | ||
| --- a/score/os/utils/abortable_blocking_reader.cpp | ||
| +++ b/score/os/utils/abortable_blocking_reader.cpp | ||
| @@ -208,22 +208,23 @@ | ||
| return score::cpp::make_unexpected(Error::createFromErrno(EINVAL)); | ||
| } | ||
|
|
||
| - const auto data_available = WaitForData(file_descriptor); | ||
| - | ||
| - if (!data_available.has_value()) | ||
| + // Wait until data is available (or timeout/abort). This function loops internally on QNX8. | ||
| + const auto wait_status = WaitForData(file_descriptor); | ||
| + if (!wait_status.has_value()) | ||
| { | ||
| - return score::cpp::make_unexpected(data_available.error()); | ||
| + return score::cpp::make_unexpected(wait_status.error()); | ||
| } | ||
|
|
||
| // Suppressed here as it is safely used: | ||
| // Provided error check and safeguard to ensure file descriptor is valid before reading. | ||
| // NOLINTNEXTLINE(score-banned-function) see comment above | ||
| - const auto expected_length = unistd_->read(file_descriptor, buffer.data(), buffer.size()); | ||
| - if ((!expected_length.has_value()) || (expected_length.value() < 0)) | ||
| + const auto read_result = unistd_->read(file_descriptor, buffer.data(), buffer.size()); | ||
| + if ((!read_result.has_value()) || (read_result.value() < 0)) | ||
| { | ||
| - return score::cpp::make_unexpected(expected_length.error()); | ||
| + return score::cpp::make_unexpected(read_result.error()); | ||
| } | ||
| - return buffer.first(static_cast<std::size_t>(expected_length.value())); | ||
| + | ||
| + return buffer.first(static_cast<std::size_t>(read_result.value())); | ||
| } | ||
|
|
||
| void AbortableBlockingReader::SignalStop() noexcept | ||
| @@ -249,37 +250,57 @@ | ||
| const NonBlockingFileDescriptor& file_descriptor) noexcept | ||
| { | ||
| std::array<struct pollfd, 2> fds{}; | ||
| - constexpr std::int8_t kNoTimeout{-1}; | ||
| + | ||
| +#ifdef __QNXNTO__ | ||
| + // QNX8 workaround until Ticket-221150 is resolved : add finite timeout so we don't sleep forever if the | ||
| + // resource manager fails to wake pollers; keep true blocking elsewhere. | ||
| + constexpr std::int8_t kPollTimeoutMs = 50; // tuneable: 10–100 ms | ||
| +#else | ||
| + constexpr std::int8_t kPollTimeoutMs = -1; // infinite blocking on other OSes | ||
| +#endif | ||
|
|
||
| fds[0].fd = stop_read_file_descriptor_; | ||
| // Suppress "AUTOSAR C++14 M5-0-21" rule findings. This rule declares: "Bitwise operators shall only be | ||
| // applied to operands of unsigned underlying type." | ||
| // Rationale: Macro POLLIN does not affect the sign of the result. | ||
| // coverity[autosar_cpp14_m5_0_21_violation] | ||
| - fds[0].events = POLLIN; | ||
| + fds[0].events = POLLIN; // self-pipe for abort | ||
|
|
||
| fds[1].fd = file_descriptor.GetUnderlying(); | ||
| + // QNX8 often reports only POLLRDNORM for readable inotify fds. | ||
| // Rationale: see comment above | ||
| // coverity[autosar_cpp14_m5_0_21_violation] | ||
| - fds[1].events = POLLIN; | ||
| + fds[1].events = (POLLIN | POLLRDNORM); | ||
|
|
||
| - // coverity[autosar_cpp14_m5_0_6_violation] | ||
| - const auto poll_result = syspoll_->poll(fds.data(), fds.size(), kNoTimeout); | ||
| + while (true) | ||
| + { | ||
| + // coverity[autosar_cpp14_m5_0_6_violation] | ||
| + const auto poll_result = syspoll_->poll(fds.data(), fds.size(), kPollTimeoutMs); | ||
|
|
||
| - if (!poll_result.has_value()) | ||
| - { | ||
| - return score::cpp::make_unexpected(poll_result.error()); | ||
| - } | ||
| + if (!poll_result.has_value()) | ||
| + { | ||
| + return score::cpp::make_unexpected(poll_result.error()); | ||
| + } | ||
|
|
||
| - // Check return event flag for stop_read_file_descriptor_ | ||
| - // Rationale: see comment above | ||
| - // coverity[autosar_cpp14_m5_0_21_violation] | ||
| - if ((static_cast<std::uint32_t>(fds[0].revents) & static_cast<std::uint32_t>(POLLIN)) != 0U) | ||
| - { | ||
| - return score::cpp::make_unexpected(Error::createFromErrno(EINTR)); | ||
| - } | ||
| + // Check return event flag for stop_read_file_descriptor_ | ||
| + // Rationale: see comment above | ||
| + // coverity[autosar_cpp14_m5_0_21_violation] | ||
| + if ((static_cast<std::uint32_t>(fds[0].revents) & static_cast<std::uint32_t>(POLLIN)) != 0U) | ||
| + { | ||
| + return score::cpp::make_unexpected(Error::createFromErrno(EINTR)); | ||
| + } | ||
| + | ||
| + // If the watched fd is readable, we're ready; otherwise it was a timeout/spurious wake. | ||
| + // Rationale: see comment above | ||
| + // coverity[autosar_cpp14_m5_0_21_violation] | ||
| + if ((static_cast<std::uint32_t>(fds[1].revents) & | ||
| + (static_cast<std::uint32_t>(POLLIN) | static_cast<std::uint32_t>(POLLRDNORM))) != 0U) | ||
| + { | ||
| + return {}; | ||
| + } | ||
|
|
||
| - return {}; | ||
| + // No event yet — timeout or spurious wake. Loop again (QNX8 workaround). | ||
| + } | ||
| } | ||
|
|
||
| score::cpp::expected<std::pair<NonBlockingFileDescriptor, NonBlockingFileDescriptor>, Error> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AFAIK this fix should be available in 8.0.4, if we add this information here it will be easier to remember when to remove the patch.