mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
Update.
2003-03-18 Ulrich Drepper <drepper@redhat.com> * pthread_condattr_getclock.c: New file. * pthread_condattr_setclock.c: New file. * sysdeps/pthread/pthread.h: Declare these new functions. * Versions [GLIBC_2.3.3] (libpthread): Add the new functions. * Makefile (libpthread-routines): Add the new functions. * sysdeps/unix/sysv/linux/internaltypes.h (struct pthread_condattr): Renamed field to value. Document use of the bits. * pthread_condattr_getpshared.c: Adjust for struct pthread_condattr change. * pthread_condattr_setpshared.c: Likewise. * sysdeps/unix/sysv/linux/lowlevelcond.sym: Add cond_clock symbol. * sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h (pthread_cond_t): Add __clock field. * sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h: Likewise. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: Implement clock selection. * sysdeps/pthread/pthread_cond_timedwait.c: Likewise. * pthread-errnos.sym: Add ENOSYS. * sysdeps/unix/sysv/linux/bits/posix_opt.h: Define _POSIX_CLOCK_SELECTION. * sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Likewise. * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Remove invalid .size directive.
This commit is contained in:
@ -602,6 +602,18 @@ extern int pthread_condattr_getpshared (__const pthread_condattr_t *
|
||||
extern int pthread_condattr_setpshared (pthread_condattr_t *__attr,
|
||||
int __pshared) __THROW;
|
||||
|
||||
#ifdef __USE_XOPEN2K
|
||||
/* Get the clock selected for the conditon variable attribute ATTR. */
|
||||
extern int pthread_condattr_getclock (__const pthread_condattr_t *
|
||||
__restrict __attr,
|
||||
__clockid_t *__restrict __clock_id)
|
||||
__THROW;
|
||||
|
||||
/* Set the clock selected for the conditon variable attribute ATTR. */
|
||||
extern int pthread_condattr_setclock (pthread_condattr_t *__attr,
|
||||
__clockid_t __clock_id) __THROW;
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __USE_XOPEN2K
|
||||
|
@ -92,14 +92,37 @@ __pthread_cond_timedwait (cond, mutex, abstime)
|
||||
|
||||
while (1)
|
||||
{
|
||||
struct timespec rt;
|
||||
#ifdef __NR_clock_gettime
|
||||
INTERNAL_SYSCALL_DECL (err);
|
||||
int val = INTERNAL_SYSCALL (clock_gettime, err, 2, cond->__data.__clock,
|
||||
&ts);
|
||||
# ifndef __ASSUME_POSIX_TIMERS
|
||||
if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (val, err), 0))
|
||||
{
|
||||
struct timeval tv;
|
||||
(void) gettimeofday (&tv, NULL);
|
||||
|
||||
/* Convert the absolute timeout value to a relative timeout. */
|
||||
rt.tv_sec = abstime->tv_sec - tv.tv_sec;
|
||||
rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000;
|
||||
}
|
||||
else
|
||||
# endif
|
||||
{
|
||||
/* Convert the absolute timeout value to a relative timeout. */
|
||||
rt.tv_sec = abstime->tv_sec - rt.tv_sec;
|
||||
rt.tv_nsec = abstime->tv_nsec - rt.tv_nsec;
|
||||
}
|
||||
#else
|
||||
/* Get the current time. So far we support only one clock. */
|
||||
struct timeval tv;
|
||||
(void) gettimeofday (&tv, NULL);
|
||||
|
||||
/* Convert the absolute timeout value to a relative timeout. */
|
||||
struct timespec rt;
|
||||
rt.tv_sec = abstime->tv_sec - tv.tv_sec;
|
||||
rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000;
|
||||
#endif
|
||||
if (rt.tv_nsec < 0)
|
||||
{
|
||||
rt.tv_nsec += 1000000000;
|
||||
|
Reference in New Issue
Block a user