diff options
| -rw-r--r-- | libcxx/src/thread.cpp | 4 | ||||
| -rw-r--r-- | libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp | 20 |
2 files changed, 23 insertions, 1 deletions
diff --git a/libcxx/src/thread.cpp b/libcxx/src/thread.cpp index bd2b7c39238..e6f57c46a7d 100644 --- a/libcxx/src/thread.cpp +++ b/libcxx/src/thread.cpp @@ -121,7 +121,9 @@ sleep_for(const chrono::nanoseconds& ns) ts.tv_sec = ts_sec_max; ts.tv_nsec = giga::num - 1; } - nanosleep(&ts, 0); + + while (nanosleep(&ts, &ts) == -1 && errno == EINTR) + ; } } diff --git a/libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp b/libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp index d66db3f9f30..f66b9627985 100644 --- a/libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp +++ b/libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp @@ -15,9 +15,29 @@ #include <thread> #include <cstdlib> #include <cassert> +#include <signal.h> +#include <sys/time.h> int main() { + int ec; + struct sigaction action; + action.sa_handler = [](int) {}; + sigemptyset(&action.sa_mask); + action.sa_flags = 0; + + ec = sigaction(SIGALRM, &action, nullptr); + assert(!ec); + + struct itimerval it; + it.it_interval = { 0 }; + it.it_value.tv_sec = 0; + it.it_value.tv_usec = 250000; + // This will result in a SIGALRM getting fired resulting in the nanosleep + // inside sleep_for getting EINTR. + ec = setitimer(ITIMER_REAL, &it, nullptr); + assert(!ec); + typedef std::chrono::system_clock Clock; typedef Clock::time_point time_point; typedef Clock::duration duration; |
