diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-09-07 09:04:06 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-09-07 09:04:06 +0000 |
| commit | bdae5218097f2181710cf9058248e4c549c6ec84 (patch) | |
| tree | 9d4008aa1d1cbfffbbd2e7525fc0c2630a44cb16 /nptl/sysdeps/pthread | |
| parent | fcaea48fef6d82c56461654248e97d0816431d2e (diff) | |
Updated to fedora-glibc-20060907T0853
Diffstat (limited to 'nptl/sysdeps/pthread')
| -rw-r--r-- | nptl/sysdeps/pthread/aio_misc.h | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/createthread.c | 3 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/gai_misc.h | 2 |
3 files changed, 4 insertions, 3 deletions
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) |