projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add support for mips and mips64 r6 isa
[musl]
/
src
/
thread
/
pthread_join.c
diff --git
a/src/thread/pthread_join.c
b/src/thread/pthread_join.c
index
bf4f03c
..
694d377
100644
(file)
--- a/
src/thread/pthread_join.c
+++ b/
src/thread/pthread_join.c
@@
-3,12
+3,17
@@
int __munmap(void *, size_t);
void __pthread_testcancel(void);
int __munmap(void *, size_t);
void __pthread_testcancel(void);
+int __pthread_setcancelstate(int, int *);
int __pthread_join(pthread_t t, void **res)
{
int __pthread_join(pthread_t t, void **res)
{
- int tmp;
+ int tmp
, cs
;
__pthread_testcancel();
__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)) __timedwait_cp(&t->tid, tmp, 0, 0, 0);
+ __pthread_setcancelstate(cs, 0);
+ a_barrier();
if (res) *res = t->result;
if (t->map_base) __munmap(t->map_base, t->map_size);
return 0;
if (res) *res = t->result;
if (t->map_base) __munmap(t->map_base, t->map_size);
return 0;