From patchwork Wed Feb 10 21:46:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 581697 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 987871402B4 for ; Thu, 11 Feb 2016 08:46:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=O688Mg95; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:to:from:subject:message-id:date:mime-version :content-type; q=dns; s=default; b=gdavB9Og07HiMFCxfTi83Y7/UtooM inqXSrKmM4cwYEPogVmacHuO7ms3nRDA/B20APiZzInljJNFO28dJgBuA7K0DWD+ GMjDNLSriOrPfYaAlzKHkOrX+If1Cn6xAyaqSw2/47KXtFNqSXvBxkKh8XcDVoJ6 WsKRqfzplV9r8c= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:to:from:subject:message-id:date:mime-version :content-type; s=default; bh=BDuL3v/+hPHyArPPpKYnhr62YVY=; b=O68 8Mg95fVp4fZ4xQdntEA0tVp8fE6wHIoMhllqw92fZtQ2vJO4Sn3PfPy/bCR1CHse zwF5+C6UCvLRA7apkKWIVnwAbyxbBqmQEcSt/uEu93s9g8QvQhQ9KsFg03NTCqkO Z7leAKS/4PCd2clyapw4KtCvPOtIWdIjU/b5+IOs= Received: (qmail 2867 invoked by alias); 10 Feb 2016 21:46:49 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 2856 invoked by uid 89); 10 Feb 2016 21:46:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=416, Hx-languages-length:2592, 4312 X-HELO: mx1.redhat.com To: GNU C Library From: Florian Weimer Subject: malloc: Remove unused definitions of thread_atfork, thread_atfork_static Message-ID: <56BBAFC4.5060300@redhat.com> Date: Wed, 10 Feb 2016 22:46:44 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 They are no longer needed because the fork handler is now called explicitly, not via the hook mechanism. Florian 2016-02-10 Florian Weimer * sysdeps/nptl/malloc-machine.h (ATFORK_MEM, __dso_handle) (thread_atfork, thread_atfork_static): Remove. * sysdeps/mach/hurd/malloc-machine.h: (thread_atfork, thread_atfork_static): Remove. diff --git a/sysdeps/mach/hurd/malloc-machine.h b/sysdeps/mach/hurd/malloc-machine.h index 515f3ff..f778b0d 100644 --- a/sysdeps/mach/hurd/malloc-machine.h +++ b/sysdeps/mach/hurd/malloc-machine.h @@ -20,8 +20,6 @@ #ifndef _MALLOC_MACHINE_H #define _MALLOC_MACHINE_H -#undef thread_atfork_static - #include #include @@ -43,12 +41,6 @@ #define mutex_trylock(m) (!__mutex_trylock(m)) -#define thread_atfork(prepare, parent, child) do {} while(0) -#define thread_atfork_static(prepare, parent, child) \ - text_set_element(_hurd_fork_prepare_hook, prepare); \ - text_set_element(_hurd_fork_parent_hook, parent); \ - text_set_element(_hurd_fork_child_hook, child); - /* No we're *not* using pthreads. */ #define __pthread_initialize ((void (*)(void))0) diff --git a/sysdeps/nptl/malloc-machine.h b/sysdeps/nptl/malloc-machine.h index 5b276df..1a2af6f 100644 --- a/sysdeps/nptl/malloc-machine.h +++ b/sysdeps/nptl/malloc-machine.h @@ -20,8 +20,6 @@ #ifndef _MALLOC_MACHINE_H #define _MALLOC_MACHINE_H -#undef thread_atfork_static - #include #include @@ -32,31 +30,6 @@ __libc_lock_define (typedef, mutex_t) #define mutex_trylock(m) __libc_lock_trylock (*(m)) #define mutex_unlock(m) __libc_lock_unlock (*(m)) -/* This is defined by newer gcc version unique for each module. */ -extern void *__dso_handle __attribute__ ((__weak__)); - -#include - -#define ATFORK_MEM static struct fork_handler atfork_mem - -#ifdef SHARED -# define thread_atfork(prepare, parent, child) \ - atfork_mem.prepare_handler = prepare; \ - atfork_mem.parent_handler = parent; \ - atfork_mem.child_handler = child; \ - atfork_mem.dso_handle = __dso_handle; \ - atfork_mem.refcntr = 1; \ - __linkin_atfork (&atfork_mem) -#else -# define thread_atfork(prepare, parent, child) \ - atfork_mem.prepare_handler = prepare; \ - atfork_mem.parent_handler = parent; \ - atfork_mem.child_handler = child; \ - atfork_mem.dso_handle = &__dso_handle == NULL ? NULL : __dso_handle; \ - atfork_mem.refcntr = 1; \ - __linkin_atfork (&atfork_mem) -#endif - #include #endif /* !defined(_MALLOC_MACHINE_H) */