From patchwork Mon Jan 13 19:42:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 37358 Received: (qmail 13167 invoked by alias); 13 Jan 2020 19:42:30 -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 13159 invoked by uid 89); 13 Jan 2020 19:42:30 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.1 spammy=HContent-Transfer-Encoding:8bit X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd, commited] htl: Add internal version of __pthread_mutex_timedlock Date: Mon, 13 Jan 2020 20:42:24 +0100 Message-Id: <20200113194224.132570-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 The C11 threads implementation will need it. --- htl/Versions | 1 + sysdeps/htl/pt-mutex-timedlock.c | 3 ++- sysdeps/htl/pthreadP.h | 2 ++ sysdeps/mach/hurd/htl/pt-mutex-timedlock.c | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/htl/Versions b/htl/Versions index 1c306acf5c..77f7335b9c 100644 --- a/htl/Versions +++ b/htl/Versions @@ -155,5 +155,6 @@ libpthread { __pthread_setspecific; __pthread_getattr_np; __pthread_attr_getstack; + __pthread_mutex_timedlock; } } diff --git a/sysdeps/htl/pt-mutex-timedlock.c b/sysdeps/htl/pt-mutex-timedlock.c index d0ebb2975e..0e50f38ef2 100644 --- a/sysdeps/htl/pt-mutex-timedlock.c +++ b/sysdeps/htl/pt-mutex-timedlock.c @@ -189,8 +189,9 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex, } int -pthread_mutex_timedlock (struct __pthread_mutex *mutex, +__pthread_mutex_timedlock (struct __pthread_mutex *mutex, const struct timespec *abstime) { return __pthread_mutex_timedlock_internal (mutex, abstime); } +strong_alias (__pthread_mutex_timedlock, pthread_mutex_timedlock) diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index af0154538a..affe7cdf53 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -29,6 +29,8 @@ extern struct __pthread **__pthread_threads; extern int _pthread_mutex_init (pthread_mutex_t *mutex, const pthread_mutexattr_t *attr); extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); +extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex, + const struct timespec *__abstime); extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); extern int __pthread_cond_broadcast (pthread_cond_t *cond); diff --git a/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c b/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c index 13136ddfe1..e83bc57875 100644 --- a/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c +++ b/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c @@ -24,7 +24,7 @@ #include int -pthread_mutex_timedlock (pthread_mutex_t *mtxp, const struct timespec *tsp) +__pthread_mutex_timedlock (pthread_mutex_t *mtxp, const struct timespec *tsp) { struct __pthread *self; int ret, flags = mtxp->__flags & GSYNC_SHARED; @@ -76,3 +76,4 @@ pthread_mutex_timedlock (pthread_mutex_t *mtxp, const struct timespec *tsp) return ret; } +strong_alias (__pthread_mutex_timedlock, pthread_mutex_timedlock)