Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From f1f4b4f9684fed185bfa8b9ed409cdf241657e99 Mon Sep 17 00:00:00 2001 |
| 2 | From: Chen Qi <Qi.Chen@windriver.com> |
| 3 | Date: Mon, 25 Feb 2019 15:03:47 +0800 |
| 4 | Subject: [PATCH 10/24] fix missing of __register_atfork for non-glibc builds |
| 5 | |
| 6 | Upstream-Status: Inappropriate [musl specific] |
| 7 | |
| 8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 9 | --- |
| 10 | src/basic/process-util.c | 7 +++++++ |
| 11 | 1 file changed, 7 insertions(+) |
| 12 | |
| 13 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c |
| 14 | index 78ce43b..aec2daf 100644 |
| 15 | --- a/src/basic/process-util.c |
| 16 | +++ b/src/basic/process-util.c |
| 17 | @@ -22,6 +22,9 @@ |
| 18 | #if HAVE_VALGRIND_VALGRIND_H |
| 19 | #include <valgrind/valgrind.h> |
| 20 | #endif |
| 21 | +#ifndef __GLIBC__ |
| 22 | +#include <pthread.h> |
| 23 | +#endif |
| 24 | |
| 25 | #include "alloc-util.h" |
| 26 | #include "architecture.h" |
| 27 | @@ -1160,11 +1163,15 @@ void reset_cached_pid(void) { |
| 28 | cached_pid = CACHED_PID_UNSET; |
| 29 | } |
| 30 | |
| 31 | +#ifdef __GLIBC__ |
| 32 | /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc |
| 33 | * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against |
| 34 | * libpthread, as it is part of glibc anyway. */ |
| 35 | extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle); |
| 36 | extern void* __dso_handle _weak_; |
| 37 | +#else |
| 38 | +#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child) |
| 39 | +#endif |
| 40 | |
| 41 | pid_t getpid_cached(void) { |
| 42 | static bool installed = false; |
| 43 | -- |
| 44 | 2.7.4 |
| 45 | |