libpthread/

2005-05-12  Neal H. Walfield  <neal@gnu.org>

	* include/pthread/pthread.h (pthread_exit): Add noreturn
	attribute.

	* sysdeps/generic/bits/condition.h (__PTHREAD_COND_INITIALIZER):
	Don't create a compound literal.
	* sysdeps/generic/bits/mutex.h (__PTHREAD_MUTEX_INITIALIZER):
	Don't create a compound literal.
	(pthread_mutex_init): Don't assign to *__MUTEX directly.
	Initialize an intermediate local variable and then copy the
	result.
	* sysdeps/generic/bits/rwlock.h (__PTHREAD_RWLOCK_INITIALIZER):
	Don't create a compound literal.
	(pthread_rwlock_init): Don't assign to *__RWLOCK directly.
	Initialize an intermediate local variable and then copy the
	result.
	* sysdeps/i386/bits/spin-lock.h (__SPIN_LOCK_INITIALIZER):
	Don't create a compound literal.

	* pthread/pt-alloc.c (initialize_pthread): Cast
	PTHREAD_MUTEX_INITIALIZER and PTHREAD_COND_INITIALIZER to create a
	compound literal.
	* tests/test-1.c (main): Use pthread_mutex_init, not
	PTHREAD_MUTEX_INIT for mutex initialization

	* sysdeps/generic/pt-barrier-init.c (pthread_barrier_init): Remove
	assert.  Copy ATTR if non-defaults are used.
	* sysdeps/generic/pt-cond-init.c (pthread_cond_init): Include
	<string.h>.  Remove assert.  Copy ATTR if non-defaults are used.
	* sysdeps/generic/pt-mutex-init.c (_pthread_mutex_init): Cast
	PTHREAD_MUTEX_INITIALIZER to create a compound literal.
	* sysdeps/generic/pt-rwlock-init.c: Include <string.h>.
	(_pthread_rwlock_init): Cast __PTHREAD_RWLOCK_INITIALIZER to
	create a compound literal.  Copy ATTR if non-defaults are used.

	* sysdeps/generic/pt-cond-timedwait.c
	(__pthread_cond_timedwait_internal): Check that ABSTIME->TV_NSEC
	is valid.  Don't shadow ERR.  Don't return before cleaning up.
	* sysdeps/generic/pt-mutex-timedlock.c (pthread_mutex_timedlock):
	Move after __pthread_mutex_timedlock_internal.  Check that
	ABSTIME->TV_NSEC is valid.
	* sysdeps/generic/pt-rwlock-timedrdlock.c
	(pthread_rwlock_timedrdlock): Move after.
	__pthread_rwlock_timedrdlock_internal.
	(__pthread_rwlock_timedrdlock_internal): Check that
	ABSTIME->TV_NSEC is valid.
	* sysdeps/generic/pt-rwlock-timedwrlock.c
	(pthread_rwlock_timedwrlock): Move after
	__pthread_rwlock_timedwrlock_internal.
	(__pthread_rwlock_timedwrlock_internal): Check that
	ABSTIME->TV_NSEC is valid.
	* sysdeps/generic/sem-timedwait.c (__sem_timedwait_internal):
	Check that TIMEOUT->TV_NSEC is valid before enqueuing the thread.

	* sysdeps/generic/pt-rwlock-rdlock.c
	(__pthread_rwlock_timedrdlock_internal): Fix declaration.

	* sysdeps/generic/pt-mutex-trylock.c (__pthread_mutex_trylock):
	Don't return EDEADLK.  POSIX does not allow it.

	* sysdeps/mach/pt-timedblock.c (__pthread_timedblock): Calculate
	the relative timeout without overflowing.

	* sysdeps/mach/hurd/i386/pt-setup.c (stack_setup): Cast THREAD.

1 files changed, 15 insertions, 7 deletions

diff --git a/sysdeps/mach/pt-timedblock.c b/sysdeps/mach/pt-timedblock.c
index 6324ae76..ddb8baec 100644
--- a/sysdeps/mach/pt-timedblock.c
+++ b/sysdeps/mach/pt-timedblock.c
@@ -1,5 +1,5 @@
 /* Block a thread with a timeout.  Mach version.
-   Copyright (C) 2000,02 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ __pthread_timedblock (struct __pthread *thread,
 {
   error_t err;
   mach_msg_header_t msg;
-  mach_msg_timeout_t ms;
+  mach_msg_timeout_t timeout;
   struct timeval now;
 
   /* We have an absolute time and now we have to convert it to a
@@ -43,15 +43,23 @@ __pthread_timedblock (struct __pthread *thread,
   err = gettimeofday(&now, NULL);
   assert (! err);
 
-  ms = abstime->tv_sec * 1000 + (abstime->tv_nsec + 999999) / 1000000
-    - now.tv_sec * 1000 - (now.tv_usec + 999) / 1000;
-
-  if (ms <= 0)
+  if (now.tv_sec > abstime->tv_sec
+      || (now.tv_sec == abstime->tv_sec
+	  && now.tv_usec > ((abstime->tv_nsec + 999) / 1000)))
     return ETIMEDOUT;
 
+  timeout = (abstime->tv_sec - now.tv_sec) * 1000;
+
+  if (((abstime->tv_nsec + 999) / 1000) >= now.tv_usec)
+    timeout -= (((abstime->tv_nsec + 999) / 1000) - now.tv_usec + 999) / 1000;
+  else
+    /* Need to do a carry.  */
+    timeout -= 1000 + ((abstime->tv_nsec + 999999) / 1000000)
+      - (now.tv_usec + 999) / 1000;
+
   err = __mach_msg (&msg, MACH_RCV_MSG | MACH_RCV_TIMEOUT, 0,
 		    sizeof msg, thread->wakeupmsg.msgh_remote_port,
-		    ms, MACH_PORT_NULL);
+		    timeout, MACH_PORT_NULL);
   if (err == EMACH_RCV_TIMED_OUT)
     return ETIMEDOUT;