From patchwork Fri Sep 22 20:26:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 114092 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp3473853edb; Fri, 22 Sep 2017 13:27:56 -0700 (PDT) X-Received: by 10.98.152.199 with SMTP id d68mr301832pfk.250.1506112076739; Fri, 22 Sep 2017 13:27:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506112076; cv=none; d=google.com; s=arc-20160816; b=0wirV9BM3bqx2UCVrzuuYujfh11qEJqjih6quPXsCWCj5SBehB0hQeF7X9VPzkIRvo ORVufYYQQw9dZYRVAFBc+bXw9MgkN+SWKkMeAq4LG+PsP1te6fAadxf+0uxde7ok2oFu 3sTj7Tn+uQRsKf2ETxu0xLMuco+LrMIj5GizNLy8CeJjuLbjMTzQ9VOkj8J/3NDFiAe7 92VIPzX7F0URJD4gyHajLJAEUArhNSYCvJIyVburzpBPti3EYyLHYwtWvib3+zrHJhkZ X7fQ9rU5UGKm3uJ+eCpEvFrJEJZ6wSUrnA73wVISmz9+NWP7Q5txy1mYh4Klqo0uieyv VIOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=QCaWO0honUX9NScP+KHvFjEQV1QqP75FVi7alj8pEww=; b=mP5jwq8bDqhN+9295Gt9PlCvE6m7CHu88pm2nj/ibKOz36sJ7qXaEjMnHBmAlmn/PU uzYSaRKubzV5RkxIXJvUIjCIbT3PV5TFMsuRjSTpxLkq8P2W/6ckWlm2gMNhJW+8okrm E/u0l9/uGVLgUVTwCXygK2pcAzP0jnOznxLFqRJ3NnZDerP9ArZqZl0U+xZBQzlmfNPE 8lQdUURpnmWxyZG7Qe7cmUytclCORfCRaIkxuS15zjNKzicraF+p5UzJoKfpMJTMZDhW tzVEHqBSMC6+G1GYyQbM8ddm6d1tOIIn+4P44fL0LV24npTk/jVG2IAvFyDa4Fcq+ipD L52A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Ie9YdYi8; spf=pass (google.com: domain of libc-alpha-return-84876-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-84876-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id w18si332885pgc.681.2017.09.22.13.27.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Sep 2017 13:27:56 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-84876-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Ie9YdYi8; spf=pass (google.com: domain of libc-alpha-return-84876-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-84876-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=glsO1fnwQSPEt9zqOigsU91dgFWRyzH hryspaVV8pG4BL3hF6L1FtcXnptEqtybbwu1m9Zt6tmQTmEmKaweMpmnTFJtAsod ofWxnKxhp7FPk31Wl69bP0GzLhePtjwxmJCmxZb3BY0/yoEqHy7W42gJyK9Hznhn 2FBTRyG3J8oU= 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:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=ALPqL8WAYq5559kj//tddRrx2CU=; b=Ie9Yd Yi8gRnX2wldBjrKvzLfvBYluCs9dq4txbcggObVAh5LRrYatbjD/XEDy6RTtQzy8 hxSVS9mjgSyt4w9FT7Hs2xP2wB4s8GPXCSKf//32aB7sgFqv+AseGdzZYzyqdBiO v66H8Hoj7hNVh4nrCCbEWPesj/GW8GKuGaRWUk= Received: (qmail 65980 invoked by alias); 22 Sep 2017 20:27:20 -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 65866 invoked by uid 89); 22 Sep 2017 20:27:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-27.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qt0-f179.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=QCaWO0honUX9NScP+KHvFjEQV1QqP75FVi7alj8pEww=; b=A1rHfkGWZq5lEtnQEzVQt8qR3XJYGVZdHean+V7sDIEgiR/p9rCyIlk6oGYQd3YFd9 8k2oYXxBcQsXBlO7YC8s1d8WETlSIutlyKeKPKiHjEuCbmJibzF6ZIdU8dFIREvnNZRB rsiV7Kix3y8X8MMkeMbLq2ULkhWxwwthU2COXcwBkw8kuna61lyD+9Eq5fPAclvJmsNu PRVX14uH9HULrYuNFqmPq+4C/fJKLynUyWjipyHHk08oIWQE2cy8uEZFOXacMIMTAvtV IgQ6/lwvxrPHgODhKzPPVI/kHsoREammW08sknYLRZzF2ha5JGMPIG/eFPr7ZusdEnTY 1K2g== X-Gm-Message-State: AHPjjUiGDRBKvkRwjdEvrK73orYd13Xi6yzdcS/Y2jbaCsKQrIpFvm6k DGTIy2vAPOxgveE9Fa/Ef7YUV7G9tJU= X-Google-Smtp-Source: AOwi7QCrycT3gb79Gdf6VumtMcx93ek8sMZCHt5gxVHKcs/XhnjfLiQiX5WY2Z4myf4mwYxiyrBnWg== X-Received: by 10.237.37.14 with SMTP id v14mr605328qtc.116.1506112036460; Fri, 22 Sep 2017 13:27:16 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 3/8] nptl: Add C11 threads call_once functions Date: Fri, 22 Sep 2017 17:26:59 -0300 Message-Id: <1506112024-22601-4-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1506112024-22601-1-git-send-email-adhemerval.zanella@linaro.org> References: <1506112024-22601-1-git-send-email-adhemerval.zanella@linaro.org> This patch adds the call_* definitions from C11 threads (ISO/IEC 9899:2011), more specifically call_once and required types. Mostly of the definitions are composed based on POSIX conterparts,including once_flag (pthread_once_t). The idea is to make possible to share POSIX internal implementations for mostly of the code (and making adjustment only when required). Checked with a build for all major ABI (aarch64-linux-gnu, alpha-linux-gnu, arm-linux-gnueabi, i386-linux-gnu, ia64-linux-gnu, m68k-linux-gnu, microblaze-linux-gnu [1], mips{64}-linux-gnu, nios2-linux-gnu, powerpc{64le}-linux-gnu, s390{x}-linux-gnu, sparc{64}-linux-gnu, tile{pro,gx}-linux-gnu, and x86_64-linux-gnu). Also ran a full check on aarch64-linux-gnu, x86_64-linux-gnu, i686-linux-gnu, arm-linux-gnueabhf, and powerpc64le-linux-gnu. * conform/data/threads.h-data (ONCE_FLAG_INIT): New macro. (once_flag): New type. (call_once): New function. * nptl/Makefile (libpthread-routines): Add call_once object. * nptl/Versions (libphread) [GLIBC_2.27]: Add call_once symbol. * nptl/call_once.c: New file. * sysdeps/nptl/threads.h (ONCE_FLAG_INIT): New define. (once_flag): New type. (call_once): New prototype. --- ChangeLog | 10 ++++++++++ conform/data/threads.h-data | 5 +++++ nptl/Makefile | 2 +- nptl/Versions | 2 +- nptl/call_once.c | 33 +++++++++++++++++++++++++++++++++ sysdeps/nptl/threads.h | 7 +++++++ 6 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 nptl/call_once.c -- 2.7.4 diff --git a/conform/data/threads.h-data b/conform/data/threads.h-data index bb5ca75..70b2fe0 100644 --- a/conform/data/threads.h-data +++ b/conform/data/threads.h-data @@ -1,5 +1,7 @@ #if defined ISO11 +macro ONCE_FLAG_INIT + constant thrd_success constant thrd_busy constant thrd_error @@ -13,6 +15,7 @@ constant mtx_timed type thrd_t type thrd_start_t type mtx_t +type once_flag function int thrd_create (thrd_t*, thrd_start_t, void*) function int thrd_equal (thrd_t, thrd_t) @@ -30,6 +33,8 @@ function int mtx_trylock (mtx_t*) function int mtx_unlock (mtx_t*) function void mtx_destroy (mtx_t*) +function void call_once (once_flag*, void (*)(void)) + #include "time.h-data" #endif diff --git a/nptl/Makefile b/nptl/Makefile index c4f6970..7d2b83f 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -142,7 +142,7 @@ libpthread-routines = nptl-init vars events version pt-interp \ thrd_create thrd_current thrd_detach thrd_equal \ thrd_exit thrd_join thrd_sleep thrd_yield \ mtx_destroy mtx_init mtx_lock mtx_timedlock \ - mtx_trylock mtx_unlock + mtx_trylock mtx_unlock call_once # pthread_setuid pthread_seteuid pthread_setreuid \ # pthread_setresuid \ # pthread_setgid pthread_setegid pthread_setregid \ diff --git a/nptl/Versions b/nptl/Versions index 5cf581a..b055860 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -269,7 +269,7 @@ libpthread { GLIBC_2.27 { thrd_create; thrd_current; thrd_detach; thrd_equal; thrd_exit; thrd_join; thrd_sleep; thrd_yield; mtx_init; mtx_lock; mtx_timedlock; mtx_trylock; - mtx_unlock; mtx_destroy; + mtx_unlock; mtx_destroy; call_once; } GLIBC_PRIVATE { diff --git a/nptl/call_once.c b/nptl/call_once.c new file mode 100644 index 0000000..8a15f1f --- /dev/null +++ b/nptl/call_once.c @@ -0,0 +1,33 @@ +/* C11 threads call once implementation. + Copyright (C) 2017 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 "thrd_priv.h" + +/* Call function func exactly once, even if invoked from several threads. + All calls must be made with the same flag object. */ +void +call_once (once_flag *flag, void (*func)(void)) +{ + _Static_assert (sizeof (once_flag) == sizeof (pthread_once_t), + "once_flag size"); + _Static_assert (alignof (once_flag) == alignof (pthread_once_t), + "once_flag alignment"); + __pthread_once (flag, func); +} diff --git a/sysdeps/nptl/threads.h b/sysdeps/nptl/threads.h index cd811f4..53fe731 100644 --- a/sysdeps/nptl/threads.h +++ b/sysdeps/nptl/threads.h @@ -27,8 +27,11 @@ __BEGIN_DECLS #include #include +#define ONCE_FLAG_INIT 0 + typedef unsigned long int thrd_t; typedef int (*thrd_start_t) (void*); +typedef int __ONCE_ALIGNMENT once_flag; /* Exit and error codes. */ enum @@ -129,6 +132,10 @@ extern int mtx_unlock (mtx_t *__mutex); /* Destroy the mutex object pointed by __mutex. */ extern void mtx_destroy (mtx_t *__mutex); +/* Call function func exactly once, even if invoked from several threads. + All calls must be made with the same __flag object. */ +extern void call_once (once_flag *__flag, void (*__func)(void)); + __END_DECLS #endif /* _THREADS_H */