projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.13.41: Require robustness
[sbcl.git]
/
src
/
runtime
/
interrupt.c
diff --git
a/src/runtime/interrupt.c
b/src/runtime/interrupt.c
index
519b46f
..
2be9e0f
100644
(file)
--- a/
src/runtime/interrupt.c
+++ b/
src/runtime/interrupt.c
@@
-108,7
+108,6
@@
void sigaddset_blockable(sigset_t *s)
#ifdef LISP_FEATURE_SB_THREAD
sigaddset(s, SIG_STOP_FOR_GC);
sigaddset(s, SIG_INTERRUPT_THREAD);
#ifdef LISP_FEATURE_SB_THREAD
sigaddset(s, SIG_STOP_FOR_GC);
sigaddset(s, SIG_INTERRUPT_THREAD);
- sigaddset(s, SIG_THREAD_EXIT);
#endif
}
#endif
}
@@
-563,9
+562,7
@@
sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context)
for(i=1;i<NSIG;i++) sigaddset(&ss,i); /* Block everything. */
sigprocmask(SIG_BLOCK,&ss,0);
for(i=1;i<NSIG;i++) sigaddset(&ss,i); /* Block everything. */
sigprocmask(SIG_BLOCK,&ss,0);
- get_spinlock(&all_threads_lock,thread->pid);
thread->state=STATE_STOPPED;
thread->state=STATE_STOPPED;
- release_spinlock(&all_threads_lock);
sigemptyset(&ss); sigaddset(&ss,SIG_STOP_FOR_GC);
sigwaitinfo(&ss,0);
sigemptyset(&ss); sigaddset(&ss,SIG_STOP_FOR_GC);
sigwaitinfo(&ss,0);
@@
-690,26
+687,20
@@
void interrupt_thread_handler(int num, siginfo_t *info, void *v_context)
void thread_exit_handler(int num, siginfo_t *info, void *v_context)
{ /* called when a child thread exits */
void thread_exit_handler(int num, siginfo_t *info, void *v_context)
{ /* called when a child thread exits */
- os_context_t *context = (os_context_t*)arch_os_get_context(&v_context);
- struct thread *th=arch_os_get_current_thread();
pid_t kid;
pid_t kid;
- int *status;
- struct interrupt_data *data=
- th ? th->interrupt_data : global_interrupt_data;
- if(maybe_defer_handler(thread_exit_handler,data,num,info,context)){
- return ;
- }
+ int status;
+
while(1) {
kid=waitpid(-1,&status,__WALL|WNOHANG);
while(1) {
kid=waitpid(-1,&status,__WALL|WNOHANG);
- if(kid<1) break;
+ if(kid<=0) break;
if(WIFEXITED(status) || WIFSIGNALED(status)) {
struct thread *th=find_thread_by_pid(kid);
if(WIFEXITED(status) || WIFSIGNALED(status)) {
struct thread *th=find_thread_by_pid(kid);
- if(!th) continue;
- funcall1(SymbolFunction(HANDLE_THREAD_EXIT),make_fixnum(kid));
- destroy_thread(th);
+ if(th) th->state=STATE_DEAD;
}
}
}
}
}
}
+
+
#endif
boolean handle_control_stack_guard_triggered(os_context_t *context,void *addr){
#endif
boolean handle_control_stack_guard_triggered(os_context_t *context,void *addr){