projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
overhaul pthread cancellation
[musl]
/
src
/
thread
/
pthread_join.c
diff --git
a/src/thread/pthread_join.c
b/src/thread/pthread_join.c
index
5210ed4
..
ba7bb7d
100644
(file)
--- a/
src/thread/pthread_join.c
+++ b/
src/thread/pthread_join.c
@@
-3,9
+3,7
@@
int pthread_join(pthread_t t, void **res)
{
int tmp = t->tid;
int pthread_join(pthread_t t, void **res)
{
int tmp = t->tid;
- CANCELPT_BEGIN;
- if (tmp) __wait(&t->tid, 0, tmp, 1);
- CANCELPT_END;
+ if (tmp) __timedwait_cp(&t->tid, tmp, 0, 0, 1);
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;