From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/8613 Path: news.gmane.org!not-for-mail From: Bobby Bingham Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH v2 2/2] pthread: implement try/timed join variants Date: Sun, 4 Oct 2015 14:55:30 -0500 Message-ID: <1443988530-23978-2-git-send-email-koorogi@koorogi.info> References: <1443988530-23978-1-git-send-email-koorogi@koorogi.info> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1443988562 28316 80.91.229.3 (4 Oct 2015 19:56:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 4 Oct 2015 19:56:02 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-8625-gllmg-musl=m.gmane.org@lists.openwall.com Sun Oct 04 21:56:02 2015 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1ZipO5-0006Ql-Dk for gllmg-musl@m.gmane.org; Sun, 04 Oct 2015 21:56:01 +0200 Original-Received: (qmail 27858 invoked by uid 550); 4 Oct 2015 19:55:57 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 27753 invoked from network); 4 Oct 2015 19:55:50 -0000 X-Mailer: git-send-email 2.6.0 In-Reply-To: <1443988530-23978-1-git-send-email-koorogi@koorogi.info> Xref: news.gmane.org gmane.linux.lib.musl.general:8613 Archived-At: --- include/pthread.h | 2 ++ src/thread/pthread_join.c | 29 ++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/include/pthread.h b/include/pthread.h index af70b73..3d2e0c4 100644 --- a/include/pthread.h +++ b/include/pthread.h @@ -214,6 +214,8 @@ struct cpu_set_t; int pthread_getaffinity_np(pthread_t, size_t, struct cpu_set_t *); int pthread_setaffinity_np(pthread_t, size_t, const struct cpu_set_t *); int pthread_getattr_np(pthread_t, pthread_attr_t *); +int pthread_tryjoin_np(pthread_t, void **); +int pthread_timedjoin_np(pthread_t, void **, const struct timespec *); #endif #ifdef __cplusplus diff --git a/src/thread/pthread_join.c b/src/thread/pthread_join.c index 694d377..b041ff8 100644 --- a/src/thread/pthread_join.c +++ b/src/thread/pthread_join.c @@ -5,18 +5,33 @@ int __munmap(void *, size_t); void __pthread_testcancel(void); int __pthread_setcancelstate(int, int *); -int __pthread_join(pthread_t t, void **res) +int __pthread_tryjoin_np(pthread_t t, void **res) { - int tmp, cs; - __pthread_testcancel(); - __pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); - if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0); - while ((tmp = t->tid)) __timedwait_cp(&t->tid, tmp, 0, 0, 0); - __pthread_setcancelstate(cs, 0); + if (t->tid) return EBUSY; a_barrier(); if (res) *res = t->result; if (t->map_base) __munmap(t->map_base, t->map_size); return 0; } +int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at) +{ + int tmp, cs, r = 0; + __pthread_testcancel(); + __pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); + if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0); + while ((tmp = t->tid) && r != ETIMEDOUT && r != EINVAL) + r = __timedwait_cp(&t->tid, tmp, CLOCK_REALTIME, at, 0); + __pthread_setcancelstate(cs, 0); + if (r == ETIMEDOUT || r == EINVAL) return r; + return __pthread_tryjoin_np(t, res); +} + +int __pthread_join(pthread_t t, void **res) +{ + return __pthread_timedjoin_np(t, res, 0); +} + +weak_alias(__pthread_tryjoin_np, pthread_tryjoin_np); +weak_alias(__pthread_timedjoin_np, pthread_timedjoin_np); weak_alias(__pthread_join, pthread_join); -- 2.6.0