From patchwork Tue May 19 10:44:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 39304 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D2F93395445A; Tue, 19 May 2020 10:44:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D2F93395445A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1589885075; bh=WtSBbHJPVlYI3afBc4KPvfenA9KofwiMp696mLSWfzg=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Bj23jio3CsU558NymR75COrBJCs3l3jk2fv2pqmndfAh3q6y7jvn0ckYT68NFNhhK LO3jyISRlhkZSLYvVxZd0sROHCGFwz4OsSFXMH3Z3QN7GU/CFojfJygeetnpbLGXGR p4oB+fd2zLcLN0YybbjxhMGQt0cBKJKnXq6RuGf0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by sourceware.org (Postfix) with ESMTP id 212B63948829 for ; Tue, 19 May 2020 10:44:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 212B63948829 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-144-pG7mLeH3OVS-g19MeoVDEw-1; Tue, 19 May 2020 06:44:31 -0400 X-MC-Unique: pG7mLeH3OVS-g19MeoVDEw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 69C09107ACCA for ; Tue, 19 May 2020 10:44:30 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-113-18.ams2.redhat.com [10.36.113.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BBA595C1BB for ; Tue, 19 May 2020 10:44:29 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 07/19] nptl: Add __pthread_attr_copy for copying pthread_attr_t objects In-Reply-To: References: Message-Id: <653128d1dee168e40595a2228e0100dcad3ac2fe.1589884403.git.fweimer@redhat.com> Date: Tue, 19 May 2020 12:44:28 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Also add the private type union pthread_attr_transparent, to reduce the amount of casting that is required. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- nptl/Makefile | 1 + nptl/Versions | 1 + nptl/pthreadP.h | 6 ++++ nptl/pthread_attr_copy.c | 57 ++++++++++++++++++++++++++++++++++++ sysdeps/nptl/internaltypes.h | 7 +++++ 5 files changed, 72 insertions(+) create mode 100644 nptl/pthread_attr_copy.c diff --git a/nptl/Makefile b/nptl/Makefile index 0dd8800f19..b4aaad0f20 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -39,6 +39,7 @@ routines = \ old_pthread_cond_destroy \ old_pthread_cond_init \ pthread_atfork \ + pthread_attr_copy \ pthread_attr_destroy \ pthread_attr_getdetachstate \ pthread_attr_getinheritsched \ diff --git a/nptl/Versions b/nptl/Versions index 65f0c077da..4c7b43354d 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -60,6 +60,7 @@ libc { __pthread_cond_destroy; __pthread_cond_init; __pthread_attr_setaffinity_np; __pthread_attr_init; __pthread_attr_destroy; + __pthread_attr_copy; } } diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index f218b01574..41b693d034 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -580,6 +580,12 @@ extern void __wait_lookup_done (void) attribute_hidden; # define PTHREAD_STATIC_FN_REQUIRE(name) __asm (".globl " #name); #endif +/* Make a deep copy of the attribute *SOURCE in *TARGET. *TARGET is + not assumed to have been initialized. Returns 0 on success, or a + positive error code otherwise. */ +int __pthread_attr_copy (pthread_attr_t *target, const pthread_attr_t *source); +libc_hidden_proto (__pthread_attr_copy) + /* Returns 0 if POL is a valid scheduling policy. */ static inline int check_sched_policy_attr (int pol) diff --git a/nptl/pthread_attr_copy.c b/nptl/pthread_attr_copy.c new file mode 100644 index 0000000000..77a1a43eeb --- /dev/null +++ b/nptl/pthread_attr_copy.c @@ -0,0 +1,57 @@ +/* Deep copy of a pthread_attr_t object. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + . */ + +#include +#include +#include + +int +__pthread_attr_copy (pthread_attr_t *target, const pthread_attr_t *source) +{ + /* Avoid overwriting *TARGET until all allocations have + succeeded. */ + union pthread_attr_transparent temp; + temp.external = *source; + + /* Force new allocation. This function has full ownership of temp. */ + temp.internal.cpuset = NULL; + temp.internal.cpusetsize = 0; + + int ret = 0; + + struct pthread_attr *isource = (struct pthread_attr *) source; + + /* Propagate affinity mask information. */ + if (isource->cpusetsize > 0) + ret = __pthread_attr_setaffinity_np (&temp.external, + isource->cpusetsize, + isource->cpuset); + + if (ret != 0) + { + /* Deallocate because we have ownership. */ + __pthread_attr_destroy (&temp.external); + return ret; + } + + /* Transfer ownership. *target is not assumed to have been + initialized. */ + *target = temp.external; + return 0; +} +libc_hidden_def (__pthread_attr_copy) diff --git a/sysdeps/nptl/internaltypes.h b/sysdeps/nptl/internaltypes.h index 71f09b4624..6d06a76baf 100644 --- a/sysdeps/nptl/internaltypes.h +++ b/sysdeps/nptl/internaltypes.h @@ -49,6 +49,13 @@ struct pthread_attr #define ATTR_FLAG_SCHED_SET 0x0020 #define ATTR_FLAG_POLICY_SET 0x0040 +/* Used to allocate a pthread_attr_t object which is also accessed + internally. */ +union pthread_attr_transparent +{ + pthread_attr_t external; + struct pthread_attr internal; +}; /* Mutex attribute data structure. */ struct pthread_mutexattr