From 4a035b9da9e065071c59a00b2009ebaf5b9470a8 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 15 Apr 2005 22:19:39 +0000 Subject: [PATCH] * old_pthread_cond_init.c: Include . (__pthread_cond_init_2_0): Fail with EINVAL if COND_ATTR is process shared or uses clock other than CLOCK_REALTIME. * pthread_cond_init.c (__pthread_cond_init): Remove bogus comment. --- nptl/ChangeLog | 7 +++++++ nptl/old_pthread_cond_init.c | 12 ++++++++---- nptl/pthread_cond_init.c | 4 +--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 8de78a3..ae3d24b 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2005-04-15 Jakub Jelinek + + * old_pthread_cond_init.c: Include . + (__pthread_cond_init_2_0): Fail with EINVAL if COND_ATTR is + process shared or uses clock other than CLOCK_REALTIME. + * pthread_cond_init.c (__pthread_cond_init): Remove bogus comment. + 2005-04-13 David S. Miller * sysdeps/sparc/sparc64/jmpbuf-unwind.h: New file. diff --git a/nptl/old_pthread_cond_init.c b/nptl/old_pthread_cond_init.c index 21bc856..47e68b0 100644 --- a/nptl/old_pthread_cond_init.c +++ b/nptl/old_pthread_cond_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -17,6 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include #include "pthreadP.h" #include @@ -27,15 +28,18 @@ __pthread_cond_init_2_0 (cond, cond_attr) pthread_cond_2_0_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. */ + struct pthread_condattr *icond_attr = (struct pthread_condattr *) cond_attr; /* The type of the first argument is actually that of the old, too small pthread_cond_t. We use only the first word of it, as a pointer. */ cond->cond = NULL; + /* We can't support PSHARED condvars in the old pthread_cond_* + functions and neither clocks other than CLOCK_REALTIME. */ + if (icond_attr != NULL && icond_attr->value) + return EINVAL; + return 0; } compat_symbol (libpthread, __pthread_cond_init_2_0, pthread_cond_init, diff --git a/nptl/pthread_cond_init.c b/nptl/pthread_cond_init.c index 03ac59d..5e2e670 100644 --- a/nptl/pthread_cond_init.c +++ b/nptl/pthread_cond_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -26,8 +26,6 @@ __pthread_cond_init (cond, cond_attr) pthread_cond_t *cond; const pthread_condattr_t *cond_attr; { - /* 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; -- 2.7.4