From 6ab8b3f51157788fb1f0e1d726bd0131ee96b9f5 Mon Sep 17 00:00:00 2001 From: Jeremie Koenig Date: Fri, 3 Sep 2010 02:19:43 +0200 Subject: Fix missed signals when using pthread_sigmask. --- debian/changelog | 6 ++++- debian/patches/libpthread_sigmask.patch | 46 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 debian/patches/libpthread_sigmask.patch diff --git a/debian/changelog b/debian/changelog index d0aa2ddd..50ca3f38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,11 @@ hurd (20100829-2) unreleased; urgency=low * debian/control: Depend on gcc-4.4 instead of gcc-4.3. Thanks Emilio! * debian/rules: Fix back debugging symbols into the hurd-dbg package. - -- Samuel Thibault Mon, 30 Aug 2010 20:12:32 +0200 + [ Jeremie Koenig ] + * debian/patches/libpthread_sigmask.patch: New patch to fix missed signals + when using pthread_sigmask. + + -- Samuel Thibault Fri, 03 Sep 2010 02:18:29 +0200 hurd (20100829-1) unstable; urgency=low diff --git a/debian/patches/libpthread_sigmask.patch b/debian/patches/libpthread_sigmask.patch new file mode 100644 index 00000000..58c244a0 --- /dev/null +++ b/debian/patches/libpthread_sigmask.patch @@ -0,0 +1,46 @@ +* libpthread/sysdeps/mach/hurd/pt-sigstate.c (__pthread_sigstate): Wake up the message +thread if any pending signals have been unblocked (code grabbed from glibc). +--- + libpthread/sysdeps/mach/hurd/pt-sigstate.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/libpthread/sysdeps/mach/hurd/pt-sigstate.c b/libpthread/sysdeps/mach/hurd/pt-sigstate.c +index 68c79c5..51263ac 100644 +--- a/libpthread/sysdeps/mach/hurd/pt-sigstate.c ++++ b/libpthread/sysdeps/mach/hurd/pt-sigstate.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #include + +@@ -31,6 +32,7 @@ __pthread_sigstate (struct __pthread *thread, int how, + { + error_t err = 0; + struct hurd_sigstate *ss; ++ sigset_t pending; + + ss = _hurd_thread_sigstate (thread->kernel_thread); + assert (ss); +@@ -63,7 +65,14 @@ __pthread_sigstate (struct __pthread *thread, int how, + if (! err && clear_pending) + __sigemptyset (&ss->pending); + ++ pending = ss->pending & ~ss->blocked; ++ + __pthread_spin_unlock (&ss->lock); + ++ if (! err && pending) ++ /* Send a message to the signal thread so it ++ will wake up and check for pending signals. */ ++ __msg_sig_post (_hurd_msgport, 0, 0, __mach_task_self ()); ++ + return err; + } +-- +1.7.1 + + + diff --git a/debian/patches/series b/debian/patches/series index 9d9109f1..d7a3ad64 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,3 +25,4 @@ libpthread_procfs.patch makedev_keep_options.patch makedev_parted_store.patch console_ignore_bdf_err.patch +libpthread_sigmask.patch -- cgit v1.2.3