From patchwork Fri Feb 2 17:04:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 126756 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp819219ljc; Fri, 2 Feb 2018 09:05:46 -0800 (PST) X-Google-Smtp-Source: AH8x227G60SDCbl+KW1FtSaiObcixPA6eXxygxRYIYhm/kyl6+ckq3icJ8Xw/OqBgC6feIaa5xHd X-Received: by 10.98.159.139 with SMTP id v11mr39996460pfk.64.1517591146820; Fri, 02 Feb 2018 09:05:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517591146; cv=none; d=google.com; s=arc-20160816; b=u6ozgwhvpHMO6UsdaxciTqmS4qbl5OrWD5uo8QZksTVNrJyM4SYUh8VDvY1Bml5Eey Sl3uhTW9xOitD8cL+t/Qr6Ww9iVEN0BlR/yCppw1iQJeswsLbdMBTcrhjOFbOu75/b4S sKG4u8eglLaQi0k58jT0qjHSL8OJL7fPE6xFb1wWjN+0JXLMw8jbksdGXpb9E2zTBZVj rYrrghyYtGlC4t0Vjrut9ueQwXNJNVkxjptFeiF71QXj2WOSmKDaM3eHKotUqzHEPSjG hyEGC+ItKBdOX02H6tuOrJll4iSRlh5Lku7GsxPlL9MWLgrJtL1uMHyX/I52YRU/hS8n +dPQ== 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=mw6cqF61ALNha4nBKQRisAQcofWrXRZmHLg8S+/qOvs=; b=cZLbpZJmcsDD5HG4F4qmIM28ufRo3GVZ2+ftruNhKxgPuDAE9BvBPV0FjpVIgKFUzW KVgwHuTP37xtm0SEiJl+KS9zokCBuJ9IkVYukUkZFeymMrbQJWJWDZ0Xh7Z3LVOEPzCX EJ/8r3UBg50Sm2RNYws2YhthMjq8P8+3gNj9ptbUb3J+pTKW0gbrYzqbgNKEVQgemPwC QJMSM33ZY6lr5dUETwPor7olNuOUZjOMoAxLrqXy15uK0a8AyUUeOrC1vnHpL6xbkN1w cH8+e+iPezcg95OFnqELfj0oAngmF84wYP6WP4bicRXaHBqgwvZS1Bp14Dx/e2CT6AQj b5lA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=n1oDxiVZ; spf=pass (google.com: domain of libc-alpha-return-89924-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-89924-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 u74si1710671pgc.445.2018.02.02.09.05.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Feb 2018 09:05:46 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-89924-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=n1oDxiVZ; spf=pass (google.com: domain of libc-alpha-return-89924-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-89924-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=pSGK66AyFKWRpVp2yac9cnaIOEGO5wL 1hTXccNnfcdzwVhWETK4lse9BSTnKlUGWNQSSp44jJvD0pBV8gkB7P/u1oimO6lh zRusrsr48sQKudJ+yCqe/7WuNI05qQjpYrf1Az78ExQgFgJwfO7rK8Td3pJ9f21a obR+F48VZ1Jc= 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=1tgcRqA0gCtAhGYdFWxBpMa25Bo=; b=n1oDx iVZK+PJ1aXGqfYFqIKJiwtFafknP/x8g6dz8PgI+TRuz8sCfrTpMQa69hz56GmUX lvW+bleWijLdfcrAHLAapOomU7nCxmHXH9N4fc0m9JaH5xRpJN6h+Rl8rc3gxLen 4xS9k1Xe7gNJzrPr4PcLstVmjYcvYI14IB/kWI= Received: (qmail 129473 invoked by alias); 2 Feb 2018 17:05:05 -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 129366 invoked by uid 89); 2 Feb 2018 17:05:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=interchange X-HELO: mail-qt0-f194.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=mw6cqF61ALNha4nBKQRisAQcofWrXRZmHLg8S+/qOvs=; b=KWUWFRFnhkhxkCtD3Ki55zhMFwHB2skmEh8wbcfI0t61Oddjle4D+16PuRIHKqF9kd MggR9w6w+9DjdYPyMl2ApoU9oKiToXVRYPWKqxVwHG+ZWV9fXFr+qS2mbQtV/yMRrxLM hkNrZsrMZaXyiBoXBld9idT6Y1qw2X/+omFAmjYApanp68lnyWY5LhH4PNaPXyXmiFUn KU1Dzl2FGGJJXe3eMb3ohRzxoKs8zQbYvL8S/XBUO6M3BxNhVOvqVN/DeDQjkHaOI4Hk NQ8NRTOEG09KmI04bO3mY+XC5bfUwYPQwFn4hYP4nyotRxa6pFkCAgQ2OYQDfo+REjeJ mTAQ== X-Gm-Message-State: AKwxytdiKpqwThmnLXuv1nQNLIfZxL9EqhwMFXWnRrLUq9TZ2gJK48gY qqeCDIe/8YLyhkQEnnWxECLyWkfFn8Q= X-Received: by 10.200.8.173 with SMTP id v42mr21598921qth.162.1517591098404; Fri, 02 Feb 2018 09:04:58 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v8 4/8] nptl: Add C11 threads cnd_* functions Date: Fri, 2 Feb 2018 15:04:40 -0200 Message-Id: <1517591084-11347-5-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1517591084-11347-1-git-send-email-adhemerval.zanella@linaro.org> References: <1517591084-11347-1-git-send-email-adhemerval.zanella@linaro.org> This patch adds the cnd_* definitions from C11 threads (ISO/IEC 9899:2011), more specifically cnd_broadcast, cnd_destroy, cnd_init, cnd_signal, cnd_timedwait, cnd_wait, and required types. Mostly of the definitions are composed based on POSIX conterparts, and cnd_t is also based on internal pthreads fields, but with distinct internal layout to avoid possible issues with code interchange (such as trying to pass POSIX structure on C11 functions and to avoid inclusion of pthread.h). The idea is to make it possible to share POSIX internal implementation for mostly of the code making adjust where only 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 (cnd_t): New type. (cnd_init): New function. (cnd_signal): Likewise. (cnd_broadcast): Likewise. (cnd_wait): Likewise. (cnd_timedwait): Likewise. (cnd_destroy): Likewise. * nptl/Makefile (libpthread-routines): Add cnd_broadcast, cnd_destroy, cnd_init, cnd_signal, cnd_timedwait, and cnd_wait object. * nptl/Versions (libpthread) [GLIBC_2.27]: Likewise. * nptl/cnd_broadcast.c: New file. * nptl/cnd_destroy.c: Likewise. * nptl/cnd_init.c: Likewise. * nptl/cnd_signal.c: Likewise. * nptl/cnd_timedwait.c: Likewise. * nptl/cnd_wait.c: Likewise. * sysdeps/nptl/threads.h (cnd_t): New type. (cnd_init): New prototype. (cnd_signa): Likewise. (cnd_broadcast): Likewise. (cnd_wait): Likewise. (cnd_timedwait): Likewise. (cnd_destroy): Likewise. --- ChangeLog | 25 +++++++++++++++++++++++++ conform/data/threads.h-data | 8 ++++++++ nptl/Makefile | 3 ++- nptl/Versions | 3 ++- nptl/cnd_broadcast.c | 26 ++++++++++++++++++++++++++ nptl/cnd_destroy.c | 26 ++++++++++++++++++++++++++ nptl/cnd_init.c | 32 ++++++++++++++++++++++++++++++++ nptl/cnd_signal.c | 26 ++++++++++++++++++++++++++ nptl/cnd_timedwait.c | 29 +++++++++++++++++++++++++++++ nptl/cnd_wait.c | 27 +++++++++++++++++++++++++++ sysdeps/nptl/threads.h | 34 ++++++++++++++++++++++++++++++++++ 11 files changed, 237 insertions(+), 2 deletions(-) create mode 100644 nptl/cnd_broadcast.c create mode 100644 nptl/cnd_destroy.c create mode 100644 nptl/cnd_init.c create mode 100644 nptl/cnd_signal.c create mode 100644 nptl/cnd_timedwait.c create mode 100644 nptl/cnd_wait.c -- 2.7.4 diff --git a/conform/data/threads.h-data b/conform/data/threads.h-data index 70b2fe0..d7c562e 100644 --- a/conform/data/threads.h-data +++ b/conform/data/threads.h-data @@ -16,6 +16,7 @@ type thrd_t type thrd_start_t type mtx_t type once_flag +type cnd_t function int thrd_create (thrd_t*, thrd_start_t, void*) function int thrd_equal (thrd_t, thrd_t) @@ -35,6 +36,13 @@ function void mtx_destroy (mtx_t*) function void call_once (once_flag*, void (*)(void)) +function int cnd_init (cnd_t*) +function int cnd_signal (cnd_t*) +function int cnd_broadcast (cnd_t*) +function int cnd_wait (cnd_t*, mtx_t*) +function int cnd_timedwait (cnd_t*, mtx_t*, const struct timespec*) +function void cnd_destroy (cnd_t*) + #include "time.h-data" #endif diff --git a/nptl/Makefile b/nptl/Makefile index e539df8..e13c07a 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -143,7 +143,8 @@ 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 call_once + mtx_trylock mtx_unlock call_once cnd_broadcast \ + cnd_destroy cnd_init cnd_signal cnd_timedwait cnd_wait # pthread_setuid pthread_seteuid pthread_setreuid \ # pthread_setresuid \ # pthread_setgid pthread_setegid pthread_setregid \ diff --git a/nptl/Versions b/nptl/Versions index f09e295..0672286 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -269,7 +269,8 @@ libpthread { GLIBC_2.28 { 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; call_once; + mtx_unlock; mtx_destroy; call_once; cnd_broadcast; cnd_destroy; cnd_init; + cnd_signal; cnd_timedwait; cnd_wait; mtx_destroy; } GLIBC_PRIVATE { diff --git a/nptl/cnd_broadcast.c b/nptl/cnd_broadcast.c new file mode 100644 index 0000000..889f88e --- /dev/null +++ b/nptl/cnd_broadcast.c @@ -0,0 +1,26 @@ +/* C11 thread conditional broadcast implementation. + Copyright (C) 2018 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 "thrd_priv.h" + +int +cnd_broadcast (cnd_t *cond) +{ + int err_code = __pthread_cond_broadcast ((pthread_cond_t*) cond); + return thrd_err_map (err_code); +} diff --git a/nptl/cnd_destroy.c b/nptl/cnd_destroy.c new file mode 100644 index 0000000..37df9e9 --- /dev/null +++ b/nptl/cnd_destroy.c @@ -0,0 +1,26 @@ +/* C11 threads conditional destroy implementation. + Copyright (C) 2018 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 "thrd_priv.h" +#include "pthreadP.h" + +void +cnd_destroy (cnd_t *cond) +{ + __pthread_cond_destroy ((pthread_cond_t *) cond); +} diff --git a/nptl/cnd_init.c b/nptl/cnd_init.c new file mode 100644 index 0000000..2d9f5c0 --- /dev/null +++ b/nptl/cnd_init.c @@ -0,0 +1,32 @@ +/* C11 thread conditional initialization implementation. + Copyright (C) 2018 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" + +int +cnd_init (cnd_t *cond) +{ + _Static_assert (sizeof (cnd_t) == sizeof (pthread_cond_t), "cnd_t size"); + _Static_assert (alignof (cnd_t) == alignof (pthread_cond_t), + "cnd_t alignment"); + + int err_code = __pthread_cond_init ((pthread_cond_t *)cond, NULL); + return thrd_err_map (err_code); +} diff --git a/nptl/cnd_signal.c b/nptl/cnd_signal.c new file mode 100644 index 0000000..8ae650b --- /dev/null +++ b/nptl/cnd_signal.c @@ -0,0 +1,26 @@ +/* C11 threads conditional signal implementation. + Copyright (C) 2018 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 "thrd_priv.h" + +int +cnd_signal (cnd_t *cond) +{ + int err_code = __pthread_cond_signal ((pthread_cond_t *) cond); + return thrd_err_map (err_code); +} diff --git a/nptl/cnd_timedwait.c b/nptl/cnd_timedwait.c new file mode 100644 index 0000000..75358fe --- /dev/null +++ b/nptl/cnd_timedwait.c @@ -0,0 +1,29 @@ +/* C11 threads conditional timed wait implementation. + Copyright (C) 2018 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 "thrd_priv.h" + +int +cnd_timedwait (cnd_t *restrict cond, mtx_t *restrict mutex, + const struct timespec* restrict time_point) +{ + int err_code = __pthread_cond_timedwait ((pthread_cond_t *) cond, + (pthread_mutex_t *) mutex, + time_point); + return thrd_err_map (err_code); +} diff --git a/nptl/cnd_wait.c b/nptl/cnd_wait.c new file mode 100644 index 0000000..727d9bb --- /dev/null +++ b/nptl/cnd_wait.c @@ -0,0 +1,27 @@ +/* C11 threads conditional wait implementaiton. + Copyright (C) 2018 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 "thrd_priv.h" + +int +cnd_wait (cnd_t *cond, mtx_t *mutex) +{ + int err_code = __pthread_cond_wait ((pthread_cond_t *) cond, + (pthread_mutex_t *) mutex); + return thrd_err_map (err_code); +} diff --git a/sysdeps/nptl/threads.h b/sysdeps/nptl/threads.h index 6c9c3ef..eb89b0a 100644 --- a/sysdeps/nptl/threads.h +++ b/sysdeps/nptl/threads.h @@ -57,6 +57,12 @@ typedef union long int __align __LOCK_ALIGNMENT; } mtx_t; +typedef union +{ + char __size[__SIZEOF_PTHREAD_COND_T]; + __extension__ long long int __align __LOCK_ALIGNMENT; +} cnd_t; + /* Threads functions. */ /* Create a new thread executing the function __FUNC. Arguments for __FUNC @@ -137,6 +143,34 @@ extern void mtx_destroy (mtx_t *__mutex); All calls must be made with the same __FLAGS object. */ extern void call_once (once_flag *__flag, void (*__func)(void)); + +/* Condition variable functions. */ + +/* Initialize new condition variable pointed by __COND. */ +extern int cnd_init (cnd_t *__cond); + +/* Unblock one thread that currently waits on condition variable pointed + by __COND. */ +extern int cnd_signal (cnd_t *__cond); + +/* Unblock all threads currently waiting on condition variable pointed by + __COND. */ +extern int cnd_broadcast (cnd_t *__cond); + +/* Block current thread on the condition variable pointed by __COND. */ +extern int cnd_wait (cnd_t *__cond, mtx_t *__mutex); + +/* Block current thread on the condition variable until condition variable + pointed by __COND is signaled or time pointed by __TIME_POINT is + reached. */ +extern int cnd_timedwait (cnd_t *__restrict __cond, + mtx_t *__restrict __mutex, + const struct timespec *__restrict __time_point); + +/* Destroy condition variable pointed by __cond and free all of its + resources. */ +extern void cnd_destroy (cnd_t *__COND); + __END_DECLS #endif /* _THREADS_H */