diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-02-25 21:44:22 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-02-25 21:44:22 +0000 |
| commit | 00a1430e3f97ae7700d53da8ef6a6eaa100ca78d (patch) | |
| tree | 818148e0707af54af8dc58c62c6238ad2cad0f2c | |
| parent | 621c133d40be92557f611e63c86ef78efd3cb7bd (diff) | |
| download | glibc-00a1430e3f97ae7700d53da8ef6a6eaa100ca78d.tar.gz glibc-00a1430e3f97ae7700d53da8ef6a6eaa100ca78d.tar.xz glibc-00a1430e3f97ae7700d53da8ef6a6eaa100ca78d.zip | |
* sysdeps/unix/sysv/linux/fork.c (__libc_fork): Reset refcntr in
new thread, don't just decrement it. Patch by Suzuki K P <suzuki@in.ibm.com>.
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/fork.c | 9 | ||||
| -rw-r--r-- | stdlib/strtod_l.c | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 22aeba830a..37ac4cf323 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2007-02-25 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/fork.c (__libc_fork): Reset refcntr in + new thread, don't just decrement it. + Patch by Suzuki K P <suzuki@in.ibm.com>. + 2007-02-21 Ulrich Drepper <drepper@redhat.com> * sysdeps/pthread/pthread-functions.h: Correct last patch, correct diff --git a/nptl/sysdeps/unix/sysv/linux/fork.c b/nptl/sysdeps/unix/sysv/linux/fork.c index 840974401b..98bb237c06 100644 --- a/nptl/sysdeps/unix/sysv/linux/fork.c +++ b/nptl/sysdeps/unix/sysv/linux/fork.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -167,8 +167,11 @@ __libc_fork (void) allp->handler->child_handler (); /* Note that we do not have to wake any possible waiter. - This is the only thread in the new process. */ - --allp->handler->refcntr; + This is the only thread in the new process. The count + may have been bumped up by other threads doing a fork. + We reset it to 1, to avoid waiting for non-existing + thread(s) to release the count. */ + allp->handler->refcntr = 1; /* XXX We could at this point look through the object pool and mark all objects not on the __fork_handlers list as diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c index 1c8ec429dc..4033e3bef8 100644 --- a/stdlib/strtod_l.c +++ b/stdlib/strtod_l.c @@ -1031,13 +1031,13 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) exponent -= incr; } - if (int_no + exponent > MAX_10_EXP + 1) + if (__builtin_expect (int_no + exponent > MAX_10_EXP + 1, 0)) { __set_errno (ERANGE); return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL; } - if (exponent < MIN_10_EXP - (DIG + 1)) + if (__builtin_expect (exponent < MIN_10_EXP - (DIG + 1), 0)) { __set_errno (ERANGE); return 0.0; |