about summary refs log tree commit diff
path: root/nptl/sysdeps/pthread/timer_routines.c
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/sysdeps/pthread/timer_routines.c
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/sysdeps/pthread/timer_routines.c')
-rw-r--r--nptl/sysdeps/pthread/timer_routines.c13
1 files changed, 10 insertions, 3 deletions
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)));
 }