From: Ulrich Drepper Date: Mon, 10 Mar 2003 21:42:52 +0000 (+0000) Subject: Update. X-Git-Tag: cvs/glibc-2_3_3~1298 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=106f6f9d9d9e09a4ea3628824a13443836e0fd2c;p=thirdparty%2Fglibc.git Update. * sysdeps/unix/sysv/linux/s390/lowlevelsem.h: Likewise. * sysdeps/unix/sysv/linux/s390/sem_post.c: Include lowlevellock.h instead of lowlevelsem.h. * sysdeps/unix/sysv/linux/s390/sem_timedwait.c: Likewise. * sysdeps/unix/sysv/linux/s390/sem_trywait.c: Likewise. * sysdeps/unix/sysv/linux/s390/sem_wait.c: Likewise. --- diff --git a/nptl/ChangeLog b/nptl/ChangeLog index d3ffdf31270..8ebb580e522 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,6 +1,12 @@ 2003-03-10 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/lowlevelsem.h: New needed anymore. + * sysdeps/unix/sysv/linux/s390/lowlevelsem.h: Likewise. + * sysdeps/unix/sysv/linux/s390/sem_post.c: Include lowlevellock.h + instead of lowlevelsem.h. + * sysdeps/unix/sysv/linux/s390/sem_timedwait.c: Likewise. + * sysdeps/unix/sysv/linux/s390/sem_trywait.c: Likewise. + * sysdeps/unix/sysv/linux/s390/sem_wait.c: Likewise. * sysdeps/unix/sysv/linux/Makefile (gen-as-const-headers): Add lowlevelrwlock.sym. diff --git a/nptl/sysdeps/unix/sysv/linux/s390/lowlevelsem.h b/nptl/sysdeps/unix/sysv/linux/s390/lowlevelsem.h deleted file mode 100644 index 720fef49a98..00000000000 --- a/nptl/sysdeps/unix/sysv/linux/s390/lowlevelsem.h +++ /dev/null @@ -1,71 +0,0 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Martin Schwidefsky , 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. */ - -#ifndef _LOWLEVELSEM_H -#define _LOWLEVELSEM_H 1 - -#include -#include -#include -#include - - -static inline int -__attribute__ ((always_inline)) -lll_sem_wait (sem_t *sem) -{ - int oldval; - int newval; - - while (1) - { - /* Atomically decrement semaphore counter if it is > 0. */ - lll_compare_and_swap ((int *) sem, oldval, newval, - "ltr %2,%1; jnp 1f; ahi %2,-1"); - /* oldval != newval if the semaphore count has been decremented. */ - if (oldval != newval) - return 0; - int err = lll_futex_wait ((int *) sem, 0); - if (err != 0 && err != -EWOULDBLOCK) - return -err; - } - return 0; -} - - -#if 0 -/* Not defined anywhere. */ -extern int __lll_sem_timedwait (sem_t *sem, const struct timespec *ts) - attribute_hidden; -#define lll_sem_timedwait(sem, timeout) \ - __lll_sem_timedwait (sem, timeout) -#endif - -static inline void -__attribute__ ((always_inline)) -lll_sem_post(sem_t *sem) -{ - int oldval; - int newval; - - lll_compare_and_swap ((int *) sem, oldval, newval, "lr %2,%1; ahi %2,1"); - lll_futex_wake ((int *) sem, newval); -} - -#endif /* lowlevelsem.h */ diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_post.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_post.c index b573532a32d..6bf577bc5f1 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/sem_post.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/sem_post.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include @@ -33,10 +33,10 @@ __new_sem_post (sem_t *sem) int err; lll_compare_and_swap ((int *) sem, oldval, newval, "lr %2,%1; ahi %2,1"); - err = lll_futex_wake(((int *) sem), newval); + err = lll_futex_wake ((int *) sem, newval); if (err < 0) { - __set_errno(-err); + __set_errno (-err); return -1; } return 0; diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c index 72368426124..669dc3ce12d 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include @@ -44,13 +44,13 @@ sem_timedwait (sem, abstime) /* Check for invalid timeout values. */ if (abstime->tv_nsec >= 1000000000) { - __set_errno(EINVAL); + __set_errno (EINVAL); return -1; } /* Get the current time. */ struct timeval tv; - gettimeofday(&tv, NULL); + (void) gettimeofday (&tv, NULL); /* Compute the relative timeout. */ struct timespec rt; @@ -59,12 +59,12 @@ sem_timedwait (sem, abstime) if (rt.tv_nsec < 0) { rt.tv_nsec += 1000000000; - rt.tv_sec--; + --rt.tv_sec; } /* Already timed out. */ if (rt.tv_sec < 0) { - __set_errno(ETIMEDOUT); + __set_errno (ETIMEDOUT); return -1; } diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_trywait.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_trywait.c index 0fa047b825a..eb6fd04ce15 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/sem_trywait.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/sem_trywait.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_wait.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_wait.c index 7050bad7603..2437de0e8a3 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/sem_wait.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/sem_wait.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include