From 32daece6bcac21ef3c8d9326fa4eab80d35affba Mon Sep 17 00:00:00 2001 From: kamil Date: Sat, 1 Feb 2020 18:14:16 +0000 Subject: Revert previous 'git grep' breaks now. --- lib/libc/gen/pthread_atfork.c | 23 +++++------------------ lib/libpthread/pthread_mutex.c | 9 ++++++--- 2 files changed, 11 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/lib/libc/gen/pthread_atfork.c b/lib/libc/gen/pthread_atfork.c index e983552683b..bfa08bf9e2d 100644 --- a/lib/libc/gen/pthread_atfork.c +++ b/lib/libc/gen/pthread_atfork.c @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_atfork.c,v 1.11 2020/02/01 15:38:46 kamil Exp $ */ +/* $NetBSD: pthread_atfork.c,v 1.12 2020/02/01 18:14:16 kamil Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -31,17 +31,15 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: pthread_atfork.c,v 1.11 2020/02/01 15:38:46 kamil Exp $"); +__RCSID("$NetBSD: pthread_atfork.c,v 1.12 2020/02/01 18:14:16 kamil Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" -#include -#include -#include #include #include #include +#include #include "reentrant.h" #ifdef __weak_alias @@ -75,22 +73,11 @@ static struct atfork_callback_q childq = SIMPLEQ_HEAD_INITIALIZER(childq); static struct atfork_callback * af_alloc(void) { - void *arena; - size_t sz; if (atfork_builtin.fn == NULL) return &atfork_builtin; - /* - * Avoid using here malloc() as this function is used on early init - * and can prematuraly initialize the malloc library. - * malloc() allocations here also confuse the LLVM Leak Sanitizer. - */ - sz = sizeof(atfork_builtin); - arena = mmap(NULL, sz, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0); - if (arena == MAP_FAILED) - return NULL; - return arena; + return malloc(sizeof(atfork_builtin)); } static void @@ -98,7 +85,7 @@ af_free(struct atfork_callback *af) { if (af != &atfork_builtin) - munmap(af, sizeof(atfork_builtin)); + free(af); } int diff --git a/lib/libpthread/pthread_mutex.c b/lib/libpthread/pthread_mutex.c index 12f501ff661..cec2563a92c 100644 --- a/lib/libpthread/pthread_mutex.c +++ b/lib/libpthread/pthread_mutex.c @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_mutex.c,v 1.73 2020/02/01 15:39:56 kamil Exp $ */ +/* $NetBSD: pthread_mutex.c,v 1.74 2020/02/01 18:14:16 kamil Exp $ */ /*- * Copyright (c) 2001, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ */ #include -__RCSID("$NetBSD: pthread_mutex.c,v 1.73 2020/02/01 15:39:56 kamil Exp $"); +__RCSID("$NetBSD: pthread_mutex.c,v 1.74 2020/02/01 18:14:16 kamil Exp $"); #include #include @@ -122,12 +122,14 @@ pthread_mutex_init(pthread_mutex_t *ptm, const pthread_mutexattr_t *attr) { uintptr_t type, proto, val, ceil; +#if 0 /* * Always initialize the mutex structure, maybe be used later * and the cost should be minimal. */ if (__predict_false(__uselibcstub)) return __libc_mutex_init_stub(ptm, attr); +#endif pthread__error(EINVAL, "Invalid mutes attribute", attr == NULL || attr->ptma_magic == _PT_MUTEXATTR_MAGIC); @@ -617,9 +619,10 @@ pthread__mutex_wakeup(pthread_t self, pthread_mutex_t *ptm) int pthread_mutexattr_init(pthread_mutexattr_t *attr) { - +#if 0 if (__predict_false(__uselibcstub)) return __libc_mutexattr_init_stub(attr); +#endif attr->ptma_magic = _PT_MUTEXATTR_MAGIC; attr->ptma_private = (void *)PTHREAD_MUTEX_DEFAULT; -- cgit