fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-29 06:32:16 +00:00
Code Issues Projects Releases Wiki Activity

simplify cancellation point handling

Browse Source 
we take advantage of the fact that unless self->cancelpt is 1,
cancellation cannot happen. so just increment it by 2 to temporarily
block cancellation. this drops pthread_create.o well under 1k.
This commit is contained in:
Rich Felker
2011-04-13 20:47:01 -04:00
parent 19c1830eaa
commit 9beb6330c0
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/thread/pthread_create.c
View File

@ -63,19 +63,8 @@ static void cancel_handler(int sig, siginfo_t *si, void *ctx)
static void cancelpt(int x) static void cancelpt(int x)
{ {
struct pthread *self = __pthread_self(); struct pthread *self = __pthread_self();
switch (x) { if ((self->cancelpoint+=x)==1 && self->cancel
case 1: && x<2U && !self->canceldisable) docancel(self);
self->cancelpoint++;
case 0:
if (self->cancel && self->cancelpoint==1 && !self->canceldisable)
docancel(self);
break;
case -1:
self->cancelpoint--;
break;
default:
self->canceldisable += x;
}
} }
static void init_threads() static void init_threads()

6
src/thread/pthread_setcancelstate.c
View File

@ -3,8 +3,8 @@
int pthread_setcancelstate(int new, int *old) int pthread_setcancelstate(int new, int *old)
{ {
struct pthread *self = pthread_self(); struct pthread *self = pthread_self();
if (old) *old = self->canceldisable & 1; if (old) *old = self->canceldisable;
if ((unsigned)new > 1) return EINVAL; if (new > 1U) return EINVAL;
self->canceldisable = (self->canceldisable & ~1) | new; self->canceldisable = new;
return 0; return 0;
} }