projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare strcoll/wcscoll for LC_COLLATE support and add ABI symbols
[musl]
/
src
/
thread
/
pthread_join.c
diff --git
a/src/thread/pthread_join.c
b/src/thread/pthread_join.c
index
5210ed4
..
719c91c
100644
(file)
--- a/
src/thread/pthread_join.c
+++ b/
src/thread/pthread_join.c
@@
-1,11
+1,14
@@
#include "pthread_impl.h"
#include "pthread_impl.h"
+#include <sys/mman.h>
+
+static void dummy(void *p)
+{
+}
int pthread_join(pthread_t t, void **res)
{
int pthread_join(pthread_t t, void **res)
{
- int tmp = t->tid;
- CANCELPT_BEGIN;
- if (tmp) __wait(&t->tid, 0, tmp, 1);
- CANCELPT_END;
+ int tmp;
+ while ((tmp = t->tid)) __timedwait(&t->tid, tmp, 0, 0, dummy, 0, 0);
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;