diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-12-17 14:33:28 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-12-17 14:33:28 -0800 |
| commit | dd6904541f6586616a6783388f18be0447e4dcb2 (patch) | |
| tree | 1a5565a1a2c607b773562d42996874ca5863694e | |
| parent | 74eb826cff5e4277d2d866a92058f27a837f8ff7 (diff) | |
| download | glibc-dd6904541f6586616a6783388f18be0447e4dcb2.tar.gz glibc-dd6904541f6586616a6783388f18be0447e4dcb2.tar.xz glibc-dd6904541f6586616a6783388f18be0447e4dcb2.zip | |
NPTL: Move fork state variables to initializer files.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/libc_pthread_init.c | 3 | ||||
| -rw-r--r-- | nptl/register-atfork.c | 2 | ||||
| -rw-r--r-- | sysdeps/nptl/fork.c | 8 |
4 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 216b2c9942..799b21a59d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-12-17 Roland McGrath <roland@hack.frob.com> + * sysdeps/nptl/fork.c (__fork_generation_pointer): Variable moved ... + * nptl/libc_pthread_init.c: ... here. + * sysdeps/nptl/fork.c (__fork_handlers): Variable moved ... + * nptl/register-atfork.c: ... here. + * sysdeps/nptl/gai_misc.h (__gai_start_notify_thread): Use pthread_sigmask rather than INTERNAL_SYSCALL. Use assert_perror to check its return value. diff --git a/nptl/libc_pthread_init.c b/nptl/libc_pthread_init.c index 4d8d710cca..2bedf86300 100644 --- a/nptl/libc_pthread_init.c +++ b/nptl/libc_pthread_init.c @@ -28,6 +28,9 @@ #include <ldsodefs.h> +unsigned long int *__fork_generation_pointer; + + #ifdef TLS_MULTIPLE_THREADS_IN_TCB void #else diff --git a/nptl/register-atfork.c b/nptl/register-atfork.c index 2cc49540b9..d79f643864 100644 --- a/nptl/register-atfork.c +++ b/nptl/register-atfork.c @@ -23,6 +23,8 @@ #include <atomic.h> +struct fork_handler *__fork_handlers; + /* Lock to protect allocation and deallocation of fork handlers. */ int __fork_lock = LLL_LOCK_INITIALIZER; diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c index 7ef693d529..dfd11698b9 100644 --- a/sysdeps/nptl/fork.c +++ b/sysdeps/nptl/fork.c @@ -32,14 +32,6 @@ #include <arch-fork.h> -unsigned long int *__fork_generation_pointer; - - - -/* The single linked list of all currently registered fork handlers. */ -struct fork_handler *__fork_handlers; - - static void fresetlockfiles (void) { |