fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-30 07:02:41 +00:00
Code Issues Projects Releases Wiki Activity

factor cancellation cleanup push/pop out of futex __timedwait function

Browse Source 
previously, the __timedwait function was optionally a cancellation
point depending on whether it was passed a pointer to a cleaup
function and context to register. as of now, only one caller actually
used such a cleanup function (and it may face removal soon); most
callers either passed a null pointer to disable cancellation or a
dummy cleanup function.

now, __timedwait is never a cancellation point, and __timedwait_cp is
the cancellable version. this makes the intent of the calling code
more obvious and avoids ugly dummy functions and long argument lists.
This commit is contained in:
Rich Felker
2015-03-02 17:46:22 -05:00
parent 76ca7a5446
commit 0fc317d83c
9 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/thread/pthread_join.c
View File

@ -3,15 +3,11 @@
int __munmap(void *, size_t);
static void dummy(void *p)
{
}
int __pthread_join(pthread_t t, void **res)
{
int tmp;
pthread_testcancel();
while ((tmp = t->tid)) __timedwait(&t->tid, tmp, 0, 0, dummy, 0, 0);
while ((tmp = t->tid)) __timedwait_cp(&t->tid, tmp, 0, 0, 0);
if (res) *res = t->result;
if (t->map_base) __munmap(t->map_base, t->map_size);
return 0;