minor locking optimizations

[musl] / src / thread / cancel_impl.c

diff --git a/src/thread/cancel_impl.c b/src/thread/cancel_impl.c
index 7bcfaef..0d80885 100644 (file)
--- a/src/thread/cancel_impl.c
+++ b/src/thread/cancel_impl.c
@@ -3,6 +3,7 @@
 void __cancel()
 {
        pthread_t self = __pthread_self();
+       self->cp_sp = 0;
        self->canceldisable = 1;
        self->cancelasync = 0;
        pthread_exit(PTHREAD_CANCELED);
@@ -16,7 +17,7 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
        uintptr_t old_sp, old_ip;
        long r;
 
-       if (!libc.lock || (self = __pthread_self())->canceldisable)
+       if (!libc.threaded || (self = __pthread_self())->canceldisable)
                return __syscall(nr, u, v, w, x, y, z);
 
        old_sp = self->cp_sp;
@@ -24,9 +25,9 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
        self->cp_sp = 0;
        self->cp_ip = 0;
        r = __syscall_cp_asm(&self->cp_sp, nr, u, v, w, x, y, z);
-       self->cp_sp = old_sp;
        self->cp_ip = old_ip;
-       if (r == -EINTR && self->cancel) __cancel();
+       self->cp_sp = old_sp;
+       if (r == -EINTR && self->cancel && !self->canceldisable) __cancel();
        return r;
 }