mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-11 13:50:06 +00:00
7ce5c1640c
2003-03-03 Martin Schwidefsky <schwidefsky@de.ibm.com> * atomic.h (atomic_exchange_and_add): Return newval, not oldval. * sysdeps/pthread/pthread_cond_timedwait.c (__pthread_cond_timedwait): Fix handling of cancellation and failing pthread_mutex_unlock call. * sysdeps/pthread/pthread_cond_wait.c (__condvar_cleanup): Likewise. (__pthread_cond_wait): Likewise. * sysdeps/pthread/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock): Fix clobber of result variable by lll_futex_timed_wait call. * sysdeps/pthread/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock): Likewise. * sysdeps/unix/sysv/linux/s390/libc-lowlevellock.c (___lll_lock): Don't define lll_unlock_wake_cb and ___lll_timedwait_tid in libc.so. * sysdeps/unix/sysv/linux/s390/lowlevellock.c: Remove XXX comments. * sysdeps/unix/sysv/linux/s390/sem_post.c (__new_sem_post): Fix check of lll_futex_wake return value.
103 lines
2.4 KiB
C
103 lines
2.4 KiB
C
/* Copyright (C) 2003 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
|
|
|
|
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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <errno.h>
|
|
#include <sysdep.h>
|
|
#include <lowlevellock.h>
|
|
#include <sys/time.h>
|
|
|
|
|
|
void
|
|
___lll_lock (futex, newval)
|
|
int *futex;
|
|
int newval;
|
|
{
|
|
do
|
|
{
|
|
int oldval;
|
|
|
|
lll_futex_wait (futex, newval);
|
|
lll_compare_and_swap (futex, oldval, newval, "lr %2,%1; ahi %2,-1");
|
|
}
|
|
while (newval != 0);
|
|
|
|
*futex = -1;
|
|
}
|
|
hidden_proto (___lll_lock)
|
|
|
|
|
|
int
|
|
lll_unlock_wake_cb (futex)
|
|
int *futex;
|
|
{
|
|
int oldval;
|
|
int newval;
|
|
|
|
lll_compare_and_swap (futex, oldval, newval, "lr %2,%1; ahi %2,1");
|
|
if (oldval < 0)
|
|
lll_futex_wake (futex, 1);
|
|
return 0;
|
|
}
|
|
hidden_proto (lll_unlock_wake_cb)
|
|
|
|
|
|
int
|
|
___lll_timedwait_tid (ptid, abstime)
|
|
int *ptid;
|
|
const struct timespec *abstime;
|
|
{
|
|
int tid;
|
|
|
|
if (abstime == NULL || abstime->tv_nsec >= 1000000000)
|
|
return EINVAL;
|
|
|
|
/* Repeat until thread terminated. */
|
|
while ((tid = *ptid) != 0)
|
|
{
|
|
/* Get current time. */
|
|
struct timeval tv;
|
|
gettimeofday (&tv, NULL);
|
|
|
|
/* Determine relative timeout. */
|
|
struct timespec rt;
|
|
rt.tv_sec = abstime->tv_sec - tv.tv_sec;
|
|
rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000;
|
|
if (rt.tv_nsec < 0)
|
|
{
|
|
rt.tv_nsec += 1000000000;
|
|
rt.tv_sec--;
|
|
}
|
|
/* Already timed out? */
|
|
if (rt.tv_sec < 0)
|
|
return ETIMEDOUT;
|
|
|
|
/* Wait until thread terminates. */
|
|
int err = lll_futex_timed_wait (ptid, tid, &rt);
|
|
|
|
/* Woken due to timeout? */
|
|
if (err == -ETIMEDOUT)
|
|
/* Yes. */
|
|
return ETIMEDOUT;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
hidden_proto (___lll_timedwait_tid)
|