Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/libs/prx/libc/src/Threads.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ int APS5_VABI _Cnd_timedwait_nid_postfix(void** conditionHandle, void** mutexHan
bool timeout = false;
try {
const auto deadlineTime = std::chrono::system_clock::time_point(
std::chrono::seconds(deadline.tv_sec) + std::chrono::nanoseconds(deadline.tv_nsec));
std::chrono::seconds(deadline.tv_sec) +
std::chrono::ceil<std::chrono::system_clock::duration>(std::chrono::nanoseconds(deadline.tv_nsec)));
timeout = (condition->native.wait_until(lock, deadlineTime) == std::cv_status::timeout);
} catch (const std::system_error&) {
lock.release();
Expand Down
20 changes: 20 additions & 0 deletions core/libs/tests/GuestLibcCndTimedWait.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,26 @@ int main() {
}
signaler.join();

constexpr std::int64_t farSeconds = 10000000000;
const Xtime farTime{farSeconds, 999999999};
constexpr auto clockSeconds = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::duration::max()).count();
if (farSeconds < clockSeconds) {
bool farReady = false;
std::thread farSignaler([&] {
std::this_thread::sleep_for(std::chrono::milliseconds(50));
Require(_Mtx_lock_nid_postfix(&mutex) == success);
farReady = true;
Require(_Cnd_broadcast_nid_postfix(&condition) == success);
Require(_Mtx_unlock_nid_postfix(&mutex) == success);
});
while (!farReady) {
Require(_Cnd_timedwait_nid_postfix(&condition, &mutex, &farTime) == success);
}
farSignaler.join();
} else {
RequireThrows<std::overflow_error>([&] { _Cnd_timedwait_nid_postfix(&condition, &mutex, &farTime); });
}

Require(_Mtx_unlock_nid_postfix(&mutex) == success);
RequireThrows<std::invalid_argument>([&] { _Cnd_timedwait_nid_postfix(&condition, &mutex, nullptr); });
const Xtime overflowCarryTime{std::numeric_limits<std::int64_t>::max(), 1000000000};
Expand Down
Loading