diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-01-18 15:10:02 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-03-12 10:19:22 -0300 |
commit | 2b47727c68b6329cf8890e56fc9dbaa4e7300961 (patch) | |
tree | a6068c64f81fa0221cddd7f96d4a2ed3fbf816a9 /posix | |
parent | cdba937662b16fc3685a8115f21e73f21330a44c (diff) | |
download | glibc-2b47727c68b6329cf8890e56fc9dbaa4e7300961.tar glibc-2b47727c68b6329cf8890e56fc9dbaa4e7300961.tar.gz glibc-2b47727c68b6329cf8890e56fc9dbaa4e7300961.tar.bz2 glibc-2b47727c68b6329cf8890e56fc9dbaa4e7300961.zip |
posix: Consolidate register-atfork
Both htl and nptl uses a different data structure to implement atfork
handlers. The nptl one was refactored by 27761a1042d to use a dynarray
which simplifies the code.
This patch moves the nptl one to be the generic implementation and
replace Hurd linked one. Different than previous NPTL, Hurd also uses
a global lock, so performance should be similar.
Checked on x86_64-linux-gnu, i686-linux-gnu, and with a build for
i686-gnu.
Diffstat (limited to 'posix')
-rw-r--r-- | posix/Makefile | 2 | ||||
-rw-r--r-- | posix/register-atfork.c | 148 |
2 files changed, 149 insertions, 1 deletions
diff --git a/posix/Makefile b/posix/Makefile index 305ec757cd..be0c72f0bb 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -39,7 +39,7 @@ routines := \ times \ wait waitpid wait3 wait4 waitid \ alarm sleep pause nanosleep \ - fork vfork _exit \ + fork vfork _exit register-atfork \ execve fexecve execv execle execl execvp execlp execvpe \ getpid getppid \ getuid geteuid getgid getegid getgroups setuid setgid group_member \ diff --git a/posix/register-atfork.c b/posix/register-atfork.c new file mode 100644 index 0000000000..6fd9e4c56a --- /dev/null +++ b/posix/register-atfork.c @@ -0,0 +1,148 @@ +/* Copyright (C) 2002-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +#include <libc-lock.h> +#include <stdbool.h> +#include <register-atfork.h> + +#define DYNARRAY_ELEMENT struct fork_handler +#define DYNARRAY_STRUCT fork_handler_list +#define DYNARRAY_PREFIX fork_handler_list_ +#define DYNARRAY_INITIAL_SIZE 48 +#include <malloc/dynarray-skeleton.c> + +static struct fork_handler_list fork_handlers; +static bool fork_handler_init = false; + +static int atfork_lock = LLL_LOCK_INITIALIZER; + +int +__register_atfork (void (*prepare) (void), void (*parent) (void), + void (*child) (void), void *dso_handle) +{ + lll_lock (atfork_lock, LLL_PRIVATE); + + if (!fork_handler_init) + { + fork_handler_list_init (&fork_handlers); + fork_handler_init = true; + } + + struct fork_handler *newp = fork_handler_list_emplace (&fork_handlers); + if (newp != NULL) + { + newp->prepare_handler = prepare; + newp->parent_handler = parent; + newp->child_handler = child; + newp->dso_handle = dso_handle; + } + + /* Release the lock. */ + lll_unlock (atfork_lock, LLL_PRIVATE); + + return newp == NULL ? ENOMEM : 0; +} +libc_hidden_def (__register_atfork) + +static struct fork_handler * +fork_handler_list_find (struct fork_handler_list *fork_handlers, + void *dso_handle) +{ + for (size_t i = 0; i < fork_handler_list_size (fork_handlers); i++) + { + struct fork_handler *elem = fork_handler_list_at (fork_handlers, i); + if (elem->dso_handle == dso_handle) + return elem; + } + return NULL; +} + +void +__unregister_atfork (void *dso_handle) +{ + lll_lock (atfork_lock, LLL_PRIVATE); + + struct fork_handler *first = fork_handler_list_find (&fork_handlers, + dso_handle); + /* Removing is done by shifting the elements in the way the elements + that are not to be removed appear in the beginning in dynarray. + This avoid the quadradic run-time if a naive strategy to remove and + shift one element at time. */ + if (first != NULL) + { + struct fork_handler *new_end = first; + first++; + for (; first != fork_handler_list_end (&fork_handlers); ++first) + { + if (first->dso_handle != dso_handle) + { + *new_end = *first; + ++new_end; + } + } + + ptrdiff_t removed = first - new_end; + for (size_t i = 0; i < removed; i++) + fork_handler_list_remove_last (&fork_handlers); + } + + lll_unlock (atfork_lock, LLL_PRIVATE); +} + +void +__run_fork_handlers (enum __run_fork_handler_type who, _Bool do_locking) +{ + struct fork_handler *runp; + + if (who == atfork_run_prepare) + { + if (do_locking) + lll_lock (atfork_lock, LLL_PRIVATE); + size_t sl = fork_handler_list_size (&fork_handlers); + for (size_t i = sl; i > 0; i--) + { + runp = fork_handler_list_at (&fork_handlers, i - 1); + if (runp->prepare_handler != NULL) + runp->prepare_handler (); + } + } + else + { + size_t sl = fork_handler_list_size (&fork_handlers); + for (size_t i = 0; i < sl; i++) + { + runp = fork_handler_list_at (&fork_handlers, i); + if (who == atfork_run_child && runp->child_handler) + runp->child_handler (); + else if (who == atfork_run_parent && runp->parent_handler) + runp->parent_handler (); + } + if (do_locking) + lll_unlock (atfork_lock, LLL_PRIVATE); + } +} + + +libc_freeres_fn (free_mem) +{ + lll_lock (atfork_lock, LLL_PRIVATE); + + fork_handler_list_free (&fork_handlers); + + lll_unlock (atfork_lock, LLL_PRIVATE); +} |