RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pthread: implement try/timed join variants

This commit is contained in:
Bobby Bingham 2016-05-07 13:48:21 -05:00 committed by Rich Felker
parent 6d38c9cf80
commit 3d98146146
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pthread.h
View File

@ -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

20
src/thread/pthread_join.c
View File

@ -5,18 +5,32 @@ int __munmap(void *, size_t);
void __pthread_testcancel(void);
int __pthread_setcancelstate(int, int *);
int __pthread_join(pthread_t t, void **res)
int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at)
{
int tmp, cs;
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)) __timedwait_cp(&t->tid, tmp, 0, 0, 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;
a_barrier();
if (res) *res = t->result;
if (t->map_base) __munmap(t->map_base, t->map_size);
return 0;
}
int __pthread_join(pthread_t t, void **res)
{
return __pthread_timedjoin_np(t, res, 0);
}
int __pthread_tryjoin_np(pthread_t t, void **res)
{
return t->tid ? EBUSY : __pthread_join(t, res);
}
weak_alias(__pthread_tryjoin_np, pthread_tryjoin_np);
weak_alias(__pthread_timedjoin_np, pthread_timedjoin_np);
weak_alias(__pthread_join, pthread_join);