commit 8a8e0cf549249fd4040fbfa7f5e4f488db7ac8ad
author Greg Hackmann <ghackmann@google.com> Mon Mar 28 19:19:15 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 28 19:19:15 2016 +0000
tree 12ac9dd1a1c64741d649aaa0ce21a7c929cbb147
parent 7c59c70200a86387d3c97e9d7f34e2b8dbed88b3
parent d15dfb2ff5835a04c66d328f27939fc4e0362c0f

Merge "clock_nanosleep: add CLOCK_THREAD_CPUTIME_ID special case"

libc/bionic/clock_nanosleep.cpp

diff --git a/libc/bionic/clock_nanosleep.cpp b/libc/bionic/clock_nanosleep.cpp
index 8e2146f..eade850 100644
--- a/libc/bionic/clock_nanosleep.cpp
+++ b/libc/bionic/clock_nanosleep.cpp
@@ -33,6 +33,8 @@
 extern "C" int ___clock_nanosleep(clockid_t, int, const timespec*, timespec*);
 
 int clock_nanosleep(clockid_t clock_id, int flags, const timespec* in, timespec* out) {
+  if (clock_id == CLOCK_THREAD_CPUTIME_ID) return EINVAL;
+
   ErrnoRestorer errno_restorer;
   return (___clock_nanosleep(clock_id, flags, in, out) == 0) ? 0 : errno;
 }

tests/time_test.cpp

diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 6cdabd2..b1f6364 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -573,3 +573,10 @@
   timespec out;
   ASSERT_EQ(EINVAL, clock_nanosleep(-1, 0, &in, &out));
 }
+
+TEST(time, clock_nanosleep_thread_cputime_id) {
+  timespec in;
+  in.tv_sec = 1;
+  in.tv_nsec = 0;
+  ASSERT_EQ(EINVAL, clock_nanosleep(CLOCK_THREAD_CPUTIME_ID, 0, &in, nullptr));
+}