about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-04-18 02:37:56 +0000
committerUlrich Drepper <drepper@redhat.com>2004-04-18 02:37:56 +0000
commit1683daeb2778c6263f2680cf98551679db7e781f (patch)
tree52427f4c33485d2fefc0a2e2c89c1cc3cdcecb5c /nptl
parentf532641db76c471c9e61a8847a820066177ec818 (diff)
downloadglibc-1683daeb2778c6263f2680cf98551679db7e781f.tar.gz
glibc-1683daeb2778c6263f2680cf98551679db7e781f.tar.xz
glibc-1683daeb2778c6263f2680cf98551679db7e781f.zip
Update.
2004-04-17  Jakub Jelinek  <jakub@redhat.com>

	* rt/Makefile (tests): Add tst-mqueue8.
	* rt/tst-mqueue8.c: New test.

	* sysdeps/unix/sysv/linux/s390/Makefile (librt-routines): Add
	rt-sysdep.
	* sysdeps/unix/sysv/linux/s390/rt-sysdep.S: New file.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog21
-rw-r--r--nptl/sysdeps/pthread/Makefile5
-rw-r--r--nptl/sysdeps/pthread/timer_create.c5
-rw-r--r--nptl/sysdeps/pthread/timer_gettime.c10
-rw-r--r--nptl/sysdeps/pthread/timer_routines.c13
-rw-r--r--nptl/sysdeps/pthread/tst-mqueue8x.c1
-rw-r--r--nptl/sysdeps/unix/sysv/linux/mq_notify.c1
-rw-r--r--nptl/tst-cancel4.c4
8 files changed, 49 insertions, 11 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f0b074d794..ff3498fb74 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,24 @@
+2004-04-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/pthread/Makefile (tests): Add tst-mqueue8x
+	in rt subdir.
+	(CFLAGS-tst-mqueue8x.c): Add -fexceptions.
+	* sysdeps/pthread/tst-mqueue8x.c: New test.
+	* tst-cancel4.c: Update comment about message queues.
+
+	* sysdeps/pthread/timer_gettime.c (timer_gettime): For expired timer
+	return it_value { 0, 0 }.
+	* sysdeps/pthread/timer_create.c (timer_create): Handle SIGEV_NONE
+	like SIGEV_SIGNAL.
+	* sysdeps/pthread/timer_routines.c (thread_expire_timer): Remove
+	assertion for SIGEV_NONE.
+	(thread_attr_compare): Compare all attributes, not just a partial
+	subset.
+
+2004-04-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/mq_notify.c: Include stdlib.h.
+
 2004-04-17  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/alpha/bits/semaphore.h (SEM_VALUE_MAX):
diff --git a/nptl/sysdeps/pthread/Makefile b/nptl/sysdeps/pthread/Makefile
index aac94065eb..05854beecd 100644
--- a/nptl/sysdeps/pthread/Makefile
+++ b/nptl/sysdeps/pthread/Makefile
@@ -40,6 +40,11 @@ $(objpfx)tst-timer: $(objpfx)librt.so $(shared-thread-library)
 else
 $(objpfx)tst-timer: $(objpfx)librt.a $(static-thread-library)
 endif
+
+ifeq ($(have-forced-unwind),yes)
+tests += tst-mqueue8x
+CFLAGS-tst-mqueue8x.c += -fexceptions
+endif
 endif
 
 ifeq ($(subdir),posix)
diff --git a/nptl/sysdeps/pthread/timer_create.c b/nptl/sysdeps/pthread/timer_create.c
index 16aa8100b4..b74fafda62 100644
--- a/nptl/sysdeps/pthread/timer_create.c
+++ b/nptl/sysdeps/pthread/timer_create.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
 
@@ -91,9 +91,6 @@ timer_create (clock_id, evp, timerid)
   switch (__builtin_expect (newtimer->event.sigev_notify, SIGEV_SIGNAL))
     {
     case SIGEV_NONE:
-      /* This is a strange choice!  */
-      break;
-
     case SIGEV_SIGNAL:
       /* We have a global thread for delivering timed signals.
 	 If it is not running, try to start it up.  */
diff --git a/nptl/sysdeps/pthread/timer_gettime.c b/nptl/sysdeps/pthread/timer_gettime.c
index 99a080311c..723a61632f 100644
--- a/nptl/sysdeps/pthread/timer_gettime.c
+++ b/nptl/sysdeps/pthread/timer_gettime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
 
@@ -54,7 +54,13 @@ timer_gettime (timerid, value)
       if (armed)
 	{
 	  clock_gettime (clock, &now);
-	  timespec_sub (&value->it_value, &expiry, &now);
+	  if (timespec_compare (&now, &expiry) < 0)
+	    timespec_sub (&value->it_value, &expiry, &now);
+	  else
+	    {
+	      value->it_value.tv_sec = 0;
+	      value->it_value.tv_nsec = 0;
+	    }
 	}
       else
 	{
diff --git a/nptl/sysdeps/pthread/timer_routines.c b/nptl/sysdeps/pthread/timer_routines.c
index af6f7412b6..3ee8fef17b 100644
--- a/nptl/sysdeps/pthread/timer_routines.c
+++ b/nptl/sysdeps/pthread/timer_routines.c
@@ -1,5 +1,5 @@
 /* Helper code for POSIX timer implementation on NPTL.
-   Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
 
@@ -319,7 +319,6 @@ thread_expire_timer (struct thread_node *self, struct timer_node *timer)
   switch (__builtin_expect (timer->event.sigev_notify, SIGEV_SIGNAL))
     {
     case SIGEV_NONE:
-      assert (! "timer_create should never have created such a timer");
       break;
 
     case SIGEV_SIGNAL:
@@ -522,7 +521,15 @@ thread_attr_compare (const pthread_attr_t *left, const pthread_attr_t *right)
   return (ileft->flags == iright->flags
 	  && ileft->schedpolicy == iright->schedpolicy
 	  && (ileft->schedparam.sched_priority
-	      == iright->schedparam.sched_priority));
+	      == iright->schedparam.sched_priority)
+	  && ileft->guardsize == iright->guardsize
+	  && ileft->stackaddr == iright->stackaddr
+	  && ileft->stacksize == iright->stacksize
+	  && ((ileft->cpuset == NULL && iright->cpuset == NULL)
+	      || (ileft->cpuset != NULL && iright->cpuset != NULL
+		  && ileft->cpusetsize == iright->cpusetsize
+		  && memcmp (ileft->cpuset, iright->cpuset,
+			     ileft->cpusetsize) == 0)));
 }
 
 
diff --git a/nptl/sysdeps/pthread/tst-mqueue8x.c b/nptl/sysdeps/pthread/tst-mqueue8x.c
new file mode 100644
index 0000000000..ca280394f7
--- /dev/null
+++ b/nptl/sysdeps/pthread/tst-mqueue8x.c
@@ -0,0 +1 @@
+#include <rt/tst-mqueue8.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/mq_notify.c b/nptl/sysdeps/unix/sysv/linux/mq_notify.c
index 2714fadb9d..e9c2b6e79a 100644
--- a/nptl/sysdeps/unix/sysv/linux/mq_notify.c
+++ b/nptl/sysdeps/unix/sysv/linux/mq_notify.c
@@ -23,6 +23,7 @@
 #include <mqueue.h>
 #include <pthread.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sysdep.h>
 #include <unistd.h>
diff --git a/nptl/tst-cancel4.c b/nptl/tst-cancel4.c
index 8af6d422ce..87000fa6a4 100644
--- a/nptl/tst-cancel4.c
+++ b/nptl/tst-cancel4.c
@@ -57,8 +57,8 @@
 
    sem_wait() and sem_timedwait() are checked in tst-cancel1[2345] tests.
 
-   POSIX message queues aren't implemented yet.  This affects
-     mq_receive()    mq_send()   mq_timedreceive()  mq_timedsend()
+   mq_send(), mq_timedsend(), mq_receive() and mq_timedreceive() are checked
+   in tst-mqueue8{,x} tests.
 
    aio_suspend() is tested in tst-cancel17.