From: Ulrich Drepper Date: Tue, 18 Mar 2003 11:25:37 +0000 (+0000) Subject: Update. X-Git-Tag: cvs/glibc-2_3_3~1173 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5cb838958b610de0bef12722860030eec964aaf;p=thirdparty%2Fglibc.git Update. 2003-03-18 Ulrich Drepper * Versions.def: Add GLIBC_2.3.3 for libpthread. --- diff --git a/ChangeLog b/ChangeLog index 9b5d10fde1b..4f73000a8fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-03-18 Ulrich Drepper + + * Versions.def: Add GLIBC_2.3.3 for libpthread. + 2003-03-17 Ulrich Drepper * sysdeps/generic/libc-start.c [!SHARED && diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 579e9852985..20ae05d91b5 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -10,6 +10,7 @@ * pthread_condattr_getpshared.c: Adjust for struct pthread_condattr change. * pthread_condattr_setpshared.c: Likewise. + * pthread_cond_init.c (__pthread_cond_init): Initialized __clock field. * sysdeps/unix/sysv/linux/lowlevelcond.sym: Add cond_clock symbol. * sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h (pthread_cond_t): Add __clock field. diff --git a/nptl/pthread_cond_init.c b/nptl/pthread_cond_init.c index e079ae92356..12a38fb492e 100644 --- a/nptl/pthread_cond_init.c +++ b/nptl/pthread_cond_init.c @@ -17,7 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include +#include #include "pthreadP.h" @@ -26,11 +26,12 @@ __pthread_cond_init (cond, cond_attr) pthread_cond_t *cond; const pthread_condattr_t *cond_attr; { - /* Note that we don't need the COND-ATTR. It contains only the - PSHARED flag which is unimportant here since conditional - variables are always usable in multiple processes. */ + /* Note that we don't need the PSHARED information from COND-ATTR. + Conditional variables are always usable in multiple processes. */ + struct pthread_condattr *icond_attr = (struct pthread_condattr *) cond_attr; cond->__data.__lock = LLL_MUTEX_LOCK_INITIALIZER; + cond->__data.__clock = (icond_attr->value & 0xfe) >> 1; cond->__data.__total_seq = 0; cond->__data.__wakeup_seq = 0; cond->__data.__woken_seq = 0;