path: root/src/thread/pthread_setcancelstate.c
diff options
authorRich Felker <>2011-04-17 13:21:13 -0400
committerRich Felker <>2011-04-17 13:21:13 -0400
commitebf82447be4b30bedc19ad868c3a0662b1ba596d (patch)
tree014a9584255a078cee6c99704306287ab13791f8 /src/thread/pthread_setcancelstate.c
parent02eff258c6a39746db287e20c142153e80c81bac (diff)
optimize cancellation enable/disable code
the goal is to be able to use pthread_setcancelstate internally in the implementation, whenever a function might want to use functions which are cancellation points but avoid becoming a cancellation point itself. i could have just used a separate internal function for temporarily inhibiting cancellation, but the solution in this commit is better because (1) it's one less implementation-specific detail in functions that need to use it, and (2) application code can also get the same benefit. previously, pthread_setcancelstate dependend on pthread_self, which would pull in unwanted thread setup overhead for non-threaded programs. now, it temporarily stores the state in the global libc struct if threads have not been initialized, and later moves it if needed. this way we can instead use __pthread_self, which has no dependencies and assumes that the thread register is already valid.
Diffstat (limited to 'src/thread/pthread_setcancelstate.c')
1 files changed, 8 insertions, 3 deletions
diff --git a/src/thread/pthread_setcancelstate.c b/src/thread/pthread_setcancelstate.c
index aa0ddcdd..6722541a 100644
--- a/src/thread/pthread_setcancelstate.c
+++ b/src/thread/pthread_setcancelstate.c
@@ -2,9 +2,14 @@
int pthread_setcancelstate(int new, int *old)
- struct pthread *self = pthread_self();
- if (old) *old = self->canceldisable;
if (new > 1U) return EINVAL;
- self->canceldisable = new;
+ if (libc.lock) {
+ struct pthread *self = __pthread_self();
+ if (old) *old = self->canceldisable;
+ self->canceldisable = new;
+ } else {
+ if (old) *old = libc.canceldisable;
+ libc.canceldisable = new;
+ }
return 0;