Updated to fedora-glibc-20060907T0853

10 files changed, 247 insertions, 24 deletions

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 4e3bf38bfd..1d89bfa396 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,49 @@
+2006-09-05  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #3124]
+	* descr.h (struct pthread): Add parent_cancelhandling.
+	* sysdeps/pthread/createthread.c (create_thread): Pass parent
+	cancelhandling value to child.
+	* pthread_create.c (start_thread): If parent thread was canceled
+	reset the SIGCANCEL mask.
+	* Makefile (tests): Add tst-cancel25.
+	* tst-cancel25.c: New file.
+
+2006-09-05  Jakub Jelinek  <jakub@redhat.com>
+            Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/pthread/gai_misc.h (GAI_MISC_NOTIFY): Don't decrement
+	counterp if it is already zero.
+	* sysdeps/pthread/aio_misc.h (AIO_MISC_NOTIFY): Likewise..
+
+2006-03-04  Jakub Jelinek  <jakub@redhat.com>
+            Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/lowlevellock.h
+	(LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END,
+	LLL_STUB_UNWIND_INFO_3, LLL_STUB_UNWIND_INFO_4): Define.
+	(lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock,
+	lll_robust_mutex_cond_lock, lll_mutex_timedlock,
+	lll_robust_mutex_timedlock, lll_mutex_unlock,
+	lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them.
+	Add _L_*_ symbols around the subsection.
+	* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Add unwind info.
+	* sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S: Likewise.
+
+2006-03-03  Jakub Jelinek  <jakub@redhat.com>
+            Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+	(LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END,
+	LLL_STUB_UNWIND_INFO_5, LLL_STUB_UNWIND_INFO_6): Define.
+	(lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock,
+	lll_robust_mutex_cond_lock, lll_mutex_timedlock,
+	lll_robust_mutex_timedlock, lll_mutex_unlock,
+	lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them.
+	Add _L_*_ symbols around the subsection.
+	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Add unwind info.
+	* sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S: Likewise.
+
 2006-08-31  Ulrich Drepper  <drepper@redhat.com>
 
 	* pthread_rwlock_trywrlock.c (__pthread_rwlock_trywrlock): Undo last
diff --git a/nptl/Makefile b/nptl/Makefile
index 74a834d64d..e907ca0c3a 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -235,7 +235,7 @@ tests = tst-typesizes \
 	tst-cancel6 tst-cancel7 tst-cancel8 tst-cancel9 tst-cancel10 \
 	tst-cancel11 tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 \
 	tst-cancel16 tst-cancel17 tst-cancel18 tst-cancel19 tst-cancel20 \
-	tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 \
+	tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 tst-cancel25 \
 	tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 tst-cleanup4 \
 	tst-flock1 tst-flock2 \
 	tst-signal1 tst-signal2 tst-signal3 tst-signal4 tst-signal5 \
diff --git a/nptl/descr.h b/nptl/descr.h
index 7acd2f4f22..b9b9ed7b98 100644
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -296,6 +296,10 @@ struct pthread
   /* True if thread must stop at startup time.  */
   bool stopped_start;
 
+  /* The parent's cancel handling at the time of the pthread_create
+     call.  This might be needed to undo the effects of a cancellation.  */
+  int parent_cancelhandling;
+
   /* Lock to synchronize access to the descriptor.  */
   lll_lock_t lock;
 
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index 315722643b..79729ced03 100644
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -251,6 +251,19 @@ start_thread (void *arg)
     }
 #endif
 
+  /* If the parent was running cancellation handlers while creating
+     the thread the new thread inherited the signal mask.  Reset the
+     cancellation signal mask.  */
+  if (__builtin_expect (pd->parent_cancelhandling & CANCELING_BITMASK, 0))
+    {
+      INTERNAL_SYSCALL_DECL (err);
+      sigset_t mask;
+      __sigemptyset (&mask);
+      __sigaddset (&mask, SIGCANCEL);
+      (void) INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_UNBLOCK, &mask,
+			       NULL, _NSIG / 8);
+    }
+
   /* This is where the try/finally block should be created.  For
      compilers without that support we do use setjmp.  */
   struct pthread_unwind_buf unwind_buf;
diff --git a/nptl/sysdeps/pthread/aio_misc.h b/nptl/sysdeps/pthread/aio_misc.h
index f285083883..c5a11f4550 100644
--- a/nptl/sysdeps/pthread/aio_misc.h
+++ b/nptl/sysdeps/pthread/aio_misc.h
@@ -29,7 +29,7 @@
 
 #define AIO_MISC_NOTIFY(waitlist) \
   do {									      \
-    if (--*waitlist->counterp == 0)					      \
+    if (*waitlist->counterp > 0 && --*waitlist->counterp == 0)		      \
       lll_futex_wake (waitlist->counterp, 1);				      \
   } while (0)
 
diff --git a/nptl/sysdeps/pthread/createthread.c b/nptl/sysdeps/pthread/createthread.c
index 03a0f1aa37..88658a16e1 100644
--- a/nptl/sysdeps/pthread/createthread.c
+++ b/nptl/sysdeps/pthread/createthread.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -242,6 +242,7 @@ create_thread (struct pthread *pd, const struct pthread_attr *attr,
 		       || (attr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0))
     stopped = true;
   pd->stopped_start = stopped;
+  pd->parent_cancelhandling = THREAD_GETMEM (THREAD_SELF, cancelhandling);
 
   /* Actually create the thread.  */
   int res = do_clone (pd, attr, clone_flags, start_thread,
diff --git a/nptl/sysdeps/pthread/gai_misc.h b/nptl/sysdeps/pthread/gai_misc.h
index 1dc351a2de..9f6a73dad1 100644
--- a/nptl/sysdeps/pthread/gai_misc.h
+++ b/nptl/sysdeps/pthread/gai_misc.h
@@ -30,7 +30,7 @@
 
 #define GAI_MISC_NOTIFY(waitlist) \
   do {									      \
-    if (--*waitlist->counterp == 0)					      \
+    if (*waitlist->counterp > 0 && --*waitlist->counterp == 0)		      \
       lll_futex_wake (waitlist->counterp, 1);				      \
   } while (0)
 
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
index 64088ef732..21de09fe91 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
@@ -68,8 +68,7 @@
 #define BUSY_WAIT_NOP          asm ("rep; nop")
 
 
-#ifdef USE_CFA_VAL_EXPRESSION
-# define LLL_STUB_UNWIND_INFO_START \
+#define LLL_STUB_UNWIND_INFO_START \
 	".section	.eh_frame,\"a\",@progbits\n"		\
 "5:\t"	".long	7f-6f	# Length of Common Information Entry\n"	\
 "6:\t"	".long	0x0	# CIE Identifier Tag\n\t"		\
@@ -94,7 +93,7 @@
 	".uleb128 10f-9f\n"					\
 "9:\t"	".byte	0x78	# DW_OP_breg8\n\t"			\
 	".sleb128 3b-1b\n"
-# define LLL_STUB_UNWIND_INFO_END \
+#define LLL_STUB_UNWIND_INFO_END \
 	".byte	0x16	# DW_CFA_val_expression\n\t"		\
 	".uleb128 0x8\n\t"					\
 	".uleb128 12f-11f\n"					\
@@ -121,7 +120,7 @@
    3: jmp 18f
    4:
    snippet.  */
-# define LLL_STUB_UNWIND_INFO_3 \
+#define LLL_STUB_UNWIND_INFO_3 \
 LLL_STUB_UNWIND_INFO_START					\
 "10:\t"	".byte	0x40 + (2b-1b) # DW_CFA_advance_loc\n\t"	\
 LLL_STUB_UNWIND_INFO_END
@@ -133,7 +132,7 @@ LLL_STUB_UNWIND_INFO_END
    3: jmp 18f
    4:
    snippet.  */
-# define LLL_STUB_UNWIND_INFO_4 \
+#define LLL_STUB_UNWIND_INFO_4 \
 LLL_STUB_UNWIND_INFO_START					\
 "10:\t"	".byte	0x40 + (0b-1b) # DW_CFA_advance_loc\n\t"	\
 	".byte	0x16	# DW_CFA_val_expression\n\t"		\
@@ -144,11 +143,6 @@ LLL_STUB_UNWIND_INFO_START					\
 "20:\t"	".byte	0x40 + (2b-0b) # DW_CFA_advance_loc\n\t"	\
 LLL_STUB_UNWIND_INFO_END
 
-#else
-# define LLL_STUB_UNWIND_INFO_3
-# define LLL_STUB_UNWIND_INFO_4
-#endif
-
 
 #define lll_futex_wait(futex, val) \
   ({									      \
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
index 7da2f12231..97085bf018 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
@@ -49,8 +49,7 @@
 #define BUSY_WAIT_NOP          asm ("rep; nop")
 
 
-#ifdef USE_CFA_VAL_EXPRESSION
-# define LLL_STUB_UNWIND_INFO_START \
+#define LLL_STUB_UNWIND_INFO_START \
 	".section	.eh_frame,\"a\",@progbits\n" 		\
 "7:\t"	".long	9f-8f	# Length of Common Information Entry\n" \
 "8:\t"	".long	0x0	# CIE Identifier Tag\n\t" 		\
@@ -75,7 +74,7 @@
 	".uleb128 12f-11f\n" 					\
 "11:\t"	".byte	0x80	# DW_OP_breg16\n\t" 			\
 	".sleb128 4b-1b\n"
-# define LLL_STUB_UNWIND_INFO_END \
+#define LLL_STUB_UNWIND_INFO_END \
 	".byte	0x16	# DW_CFA_val_expression\n\t" 		\
 	".uleb128 0x10\n\t" 					\
 	".uleb128 14f-13f\n" 					\
@@ -122,7 +121,7 @@
    5: jmp 24f
    6:
    snippet.  */
-# define LLL_STUB_UNWIND_INFO_5 \
+#define LLL_STUB_UNWIND_INFO_5 \
 LLL_STUB_UNWIND_INFO_START					\
 "12:\t"	".byte	0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" 	\
 LLL_STUB_UNWIND_INFO_END
@@ -136,7 +135,7 @@ LLL_STUB_UNWIND_INFO_END
    5: jmp 24f
    6:
    snippet.  */
-# define LLL_STUB_UNWIND_INFO_6 \
+#define LLL_STUB_UNWIND_INFO_6 \
 LLL_STUB_UNWIND_INFO_START					\
 "12:\t"	".byte	0x40 + (0b-1b) # DW_CFA_advance_loc\n\t" 	\
 	".byte	0x16	# DW_CFA_val_expression\n\t" 		\
@@ -147,11 +146,6 @@ LLL_STUB_UNWIND_INFO_START					\
 "26:\t"	".byte	0x40 + (2b-0b) # DW_CFA_advance_loc\n\t" 	\
 LLL_STUB_UNWIND_INFO_END
 
-#else
-# define LLL_STUB_UNWIND_INFO_5
-# define LLL_STUB_UNWIND_INFO_6
-#endif
-
 
 #define lll_futex_wait(futex, val) \
   ({									      \
diff --git a/nptl/tst-cancel25.c b/nptl/tst-cancel25.c
new file mode 100644
index 0000000000..00b99ad553
--- /dev/null
+++ b/nptl/tst-cancel25.c
@@ -0,0 +1,171 @@
+#include <pthreadP.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+
+static pthread_barrier_t b;
+static pthread_t th2;
+
+
+static void *
+tf2 (void *arg)
+{
+  sigset_t mask;
+  if (pthread_sigmask (SIG_SETMASK, NULL, &mask) != 0)
+    {
+      puts ("pthread_sigmask failed");
+      exit (1);
+    }
+  if (sigismember (&mask, SIGCANCEL))
+    {
+      puts ("SIGCANCEL blocked in new thread");
+      exit (1);
+    }
+
+  /* Sync with the main thread so that we do not test anything else.  */
+  int e = pthread_barrier_wait (&b);
+  if (e != 0  && e != PTHREAD_BARRIER_SERIAL_THREAD)
+    {
+      puts ("barrier_wait failed");
+      exit (1);
+    }
+
+  while (1)
+    {
+      /* Just a cancelable call.  */
+      struct timespec ts = { 10000, 0 };
+      nanosleep (&ts, 0);
+    }
+
+  return NULL;
+}
+
+
+static void
+unwhand (void *arg)
+{
+  if (pthread_create (&th2, NULL, tf2, NULL) != 0)
+    {
+      puts ("unwhand: create failed");
+      exit (1);
+    }
+}
+
+
+static void *
+tf (void *arg)
+{
+  pthread_cleanup_push (unwhand, NULL);
+
+  /* Sync with the main thread so that we do not test anything else.  */
+  int e = pthread_barrier_wait (&b);
+  if (e != 0  && e != PTHREAD_BARRIER_SERIAL_THREAD)
+    {
+      puts ("barrier_wait failed");
+      exit (1);
+    }
+
+  while (1)
+    {
+      /* Just a cancelable call.  */
+      struct timespec ts = { 10000, 0 };
+      nanosleep (&ts, 0);
+    }
+
+  pthread_cleanup_pop (0);
+
+  return NULL;
+}
+
+
+static int
+do_test (void)
+{
+  if (pthread_barrier_init (&b, NULL, 2) != 0)
+    {
+      puts ("barrier_init failed");
+      return 1;
+    }
+
+  pthread_t th1;
+  if (pthread_create (&th1, NULL, tf, NULL) != 0)
+    {
+      puts ("create failed");
+      return 1;
+    }
+
+  int e = pthread_barrier_wait (&b);
+  if (e != 0  && e != PTHREAD_BARRIER_SERIAL_THREAD)
+    {
+      puts ("barrier_wait failed");
+      return 1;
+    }
+
+  /* Make sure tf1 enters nanosleep.  */
+  struct timespec ts = { 0, 500000000 };
+  while (nanosleep (&ts, &ts) != 0)
+    ;
+
+  if (pthread_cancel (th1) != 0)
+    {
+      puts ("1st cancel failed");
+      return 1;
+    }
+
+  void *res;
+  if (pthread_join (th1, &res) != 0)
+    {
+      puts ("1st join failed");
+      return 1;
+    }
+  if (res != PTHREAD_CANCELED)
+    {
+      puts ("1st thread not canceled");
+      return 1;
+    }
+
+  e = pthread_barrier_wait (&b);
+  if (e != 0  && e != PTHREAD_BARRIER_SERIAL_THREAD)
+    {
+      puts ("barrier_wait failed");
+      return 1;
+    }
+
+  /* Make sure tf2 enters nanosleep.  */
+  ts.tv_sec = 0;
+  ts.tv_nsec = 500000000;
+  while (nanosleep (&ts, &ts) != 0)
+    ;
+
+  puts ("calling pthread_cancel the second time");
+  if (pthread_cancel (th2) != 0)
+    {
+      puts ("2nd cancel failed");
+      return 1;
+    }
+
+  puts ("calling pthread_join the second time");
+  if (pthread_join (th2, &res) != 0)
+    {
+      puts ("2nd join failed");
+      return 1;
+    }
+  if (res != PTHREAD_CANCELED)
+    {
+      puts ("2nd thread not canceled");
+      return 1;
+    }
+
+  if (pthread_barrier_destroy (&b) != 0)
+    {
+      puts ("barrier_destroy failed");
+      return 0;
+    }
+
+  return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#define TIMEOUT 4
+#include "../test-skeleton.c"