diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2012-08-30 23:48:39 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-08-30 23:48:39 +0200 |
commit | a8b134d8c667b0105d7194a78f3fe478a3857302 (patch) | |
tree | 94da06519d2a623ce4e7aee21fd7b32ffecfea59 /sysdeps/generic/pt-condattr-setclock.c | |
parent | 013f554871c671f88942c9429720d3bb9a76c5ea (diff) | |
parent | 0096579c8bea920f7c42b40ea22db621da6480a5 (diff) |
Merge commit 'refs/top-bases/t/stand-alone' into t/stand-alonet/stand-alone
Conflicts:
Makefile.am
Diffstat (limited to 'sysdeps/generic/pt-condattr-setclock.c')
-rw-r--r-- | sysdeps/generic/pt-condattr-setclock.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/sysdeps/generic/pt-condattr-setclock.c b/sysdeps/generic/pt-condattr-setclock.c index 984c17e..c5a78ef 100644 --- a/sysdeps/generic/pt-condattr-setclock.c +++ b/sysdeps/generic/pt-condattr-setclock.c @@ -23,11 +23,30 @@ int pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock) { - if (__pthread_default_condattr.clock == clock) + /* Only a few clocks are allowed. CLOCK_REALTIME is always allowed. + CLOCK_MONOTONIC only if the kernel has the necessary support. */ + if (clock == CLOCK_MONOTONIC) { - attr->clock = clock; - return 0; + /* Check whether the clock is available. */ + static int avail; + + if (avail == 0) + { + struct timespec ts; + int res; + + res = clock_getres (CLOCK_MONOTONIC, &ts); + avail = res < 0 ? -1 : 1; + } + + if (avail < 0) + /* Not available. */ + return EINVAL; } + else if (clock != CLOCK_REALTIME) + return EINVAL; + + attr->clock = clock; - return EINVAL; + return 0; } |