projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix pointer type mismatch and misplacement of const
[musl]
/
src
/
thread
/
cancel_impl.c
diff --git
a/src/thread/cancel_impl.c
b/src/thread/cancel_impl.c
index
9a02e1a
..
525d290
100644
(file)
--- a/
src/thread/cancel_impl.c
+++ b/
src/thread/cancel_impl.c
@@
-1,33
+1,31
@@
#include "pthread_impl.h"
#include "pthread_impl.h"
+#include "syscall.h"
void __cancel()
{
pthread_t self = __pthread_self();
void __cancel()
{
pthread_t self = __pthread_self();
- self->cp_sp = 0;
self->canceldisable = 1;
self->cancelasync = 0;
pthread_exit(PTHREAD_CANCELED);
}
self->canceldisable = 1;
self->cancelasync = 0;
pthread_exit(PTHREAD_CANCELED);
}
-long __syscall_cp_asm(volatile void *, long, long, long, long, long, long, long);
+long __syscall_cp_asm(volatile void *, syscall_arg_t,
+ syscall_arg_t, syscall_arg_t, syscall_arg_t,
+ syscall_arg_t, syscall_arg_t, syscall_arg_t);
-long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
+long (__syscall_cp)(syscall_arg_t nr,
+ syscall_arg_t u, syscall_arg_t v, syscall_arg_t w,
+ syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
{
pthread_t self;
{
pthread_t self;
- uintptr_t old_sp, old_ip;
long r;
long r;
- if (!libc.
threaded
|| (self = __pthread_self())->canceldisable)
+ if (!libc.
has_thread_pointer
|| (self = __pthread_self())->canceldisable)
return __syscall(nr, u, v, w, x, y, z);
return __syscall(nr, u, v, w, x, y, z);
- old_sp = self->cp_sp;
- old_ip = self->cp_ip;
- self->cp_sp = 0;
- self->cp_ip = 0;
- r = __syscall_cp_asm(&self->cp_sp, nr, u, v, w, x, y, z);
- self->cp_ip = old_ip;
- self->cp_sp = old_sp;
- if (r == -EINTR && self->cancel && !self->canceldisable) __cancel();
+ r = __syscall_cp_asm(&self->cancel, nr, u, v, w, x, y, z);
+ if (r==-EINTR && nr!=SYS_close && self->cancel && !self->canceldisable)
+ __cancel();
return r;
}
return r;
}
@@
-41,26
+39,26
@@
static void cancel_handler(int sig, siginfo_t *si, void *ctx)
{
pthread_t self = __pthread_self();
ucontext_t *uc = ctx;
{
pthread_t self = __pthread_self();
ucontext_t *uc = ctx;
-
uintptr_t sp = ((uintptr_t *)&uc->uc_mcontext)[CANCEL_REG_S
P];
-
uintptr_t ip = ((uintptr_t *)&uc->uc_mcontext)[CANCEL_REG_IP
];
+
const char *ip = ((char **)&uc->uc_mcontext)[CANCEL_REG_I
P];
+
extern const char __cp_begin[1], __cp_end[1
];
if (!self->cancel || self->canceldisable) return;
_sigaddset(&uc->uc_sigmask, SIGCANCEL);
if (!self->cancel || self->canceldisable) return;
_sigaddset(&uc->uc_sigmask, SIGCANCEL);
- if (self->cancelasync ||
sp == self->cp_sp && ip <= self->cp_ip
) {
+ if (self->cancelasync ||
ip >= __cp_begin && ip < __cp_end
) {
self->canceldisable = 1;
pthread_sigmask(SIG_SETMASK, &uc->uc_sigmask, 0);
__cancel();
}
self->canceldisable = 1;
pthread_sigmask(SIG_SETMASK, &uc->uc_sigmask, 0);
__cancel();
}
- if (self->cp_sp)
- __syscall(SYS_tgkill, self->pid, self->tid, SIGCANCEL);
+ __syscall(SYS_tgkill, self->pid, self->tid, SIGCANCEL);
}
}
-
static void
testcancel()
+
void __
testcancel()
{
{
- pthread_t self = __pthread_self();
+ if (!libc.has_thread_pointer) return;
+ pthread_t self = pthread_self();
if (self->cancel && !self->canceldisable)
__cancel();
}
if (self->cancel && !self->canceldisable)
__cancel();
}
@@
-73,7
+71,6
@@
static void init_cancellation()
};
sigfillset(&sa.sa_mask);
__libc_sigaction(SIGCANCEL, &sa, 0);
};
sigfillset(&sa.sa_mask);
__libc_sigaction(SIGCANCEL, &sa, 0);
- libc.testcancel = testcancel;
}
int pthread_cancel(pthread_t t)
}
int pthread_cancel(pthread_t t)