about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-07-10 14:18:14 -0700
committerRoland McGrath <roland@hack.frob.com>2015-07-10 14:18:14 -0700
commit398a80fec83a41d9f8d16bc3943b9179017a3ee1 (patch)
tree2e5a07549a2bc958fe975bf7d3fa11c2dad2a078
parentef115d3ade7a905f36a7e5f986e6dde070b2c286 (diff)
downloadglibc-398a80fec83a41d9f8d16bc3943b9179017a3ee1.tar.gz
glibc-398a80fec83a41d9f8d16bc3943b9179017a3ee1.tar.xz
glibc-398a80fec83a41d9f8d16bc3943b9179017a3ee1.zip
NaCl: Make pthread_condattr_setclock reject CLOCK_MONOTONIC.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/nacl/pthread_condattr_setclock.c42
2 files changed, 46 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 01032ba1c2..b6e7a791f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-10  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/nacl/pthread_condattr_setclock.c: New file.
+
 2015-07-10  Chris Metcalf  <cmetcalf@ezchip.com>
 
 	* sysdeps/tile/libm-test-ulps: Regenerated.
diff --git a/sysdeps/nacl/pthread_condattr_setclock.c b/sysdeps/nacl/pthread_condattr_setclock.c
new file mode 100644
index 0000000000..fc33ec9382
--- /dev/null
+++ b/sysdeps/nacl/pthread_condattr_setclock.c
@@ -0,0 +1,42 @@
+/* Set the clock for timeouts on a condition variable.  NaCl version.
+   Copyright (C) 2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <errno.h>
+#include "pthreadP.h"
+
+
+int
+pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock_id)
+{
+  switch (clock_id)
+    {
+    case CLOCK_REALTIME:
+      /* This is the default state and the only one actually supported.  */
+      return 0;
+
+    case CLOCK_MONOTONIC:
+      /* NaCl recognizes CLOCK_MONOTONIC for other purposes, so it is a
+         "known clock".  But NaCl doesn't support it for this purpose.  */
+      return ENOTSUP;
+
+    default:
+      /* The only other recognized clocks are CPU-time clocks,
+         which POSIX says should get EINVAL.  */
+      return EINVAL;
+    }
+}