[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1443477525-24743-2-git-send-email-koorogi@koorogi.info>
Date: Mon, 28 Sep 2015 16:58:45 -0500
From: Bobby Bingham <koorogi@...rogi.info>
To: musl@...ts.openwall.com
Subject: [PATCH 2/2] pthread: implement try/timed join variants
---
include/pthread.h | 2 ++
src/thread/pthread_join.c | 34 +++++++++++++++++++++++++++-------
2 files changed, 29 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 eb78e2f..9c3be08 100644
--- a/src/thread/pthread_join.c
+++ b/src/thread/pthread_join.c
@@ -5,19 +5,39 @@ int __munmap(void *, size_t);
void __pthread_testcancel(void);
int __pthread_setcancelstate(int, int *);
-int __pthread_join(pthread_t t, void **res)
+static int reclaim(pthread_t t, void **res)
{
- int tmp, cs;
+ if (res) *res = t->result;
+ if (t->map_base) __munmap(t->map_base, t->map_size);
+ return 0;
+}
+
+int __pthread_tryjoin_np(pthread_t t, void **res)
+{
+ if (t->tid) return EBUSY;
+ a_barrier();
+ return reclaim(t, res);
+}
+
+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);
if (!(tmp = t->tid)) a_barrier();
- else do __timedwait_cp(&t->tid, tmp, 0, 0, 0);
- while ((tmp = t->tid));
+ else do r = __timedwait_cp(&t->tid, tmp, CLOCK_REALTIME, at, 0);
+ while ((tmp = t->tid) && r != ETIMEDOUT && r != EINVAL);
__pthread_setcancelstate(cs, 0);
- if (res) *res = t->result;
- if (t->map_base) __munmap(t->map_base, t->map_size);
- return 0;
+ if (r == ETIMEDOUT || r == EINVAL) return r;
+ return reclaim(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.5.3
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
