X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fthread.c;h=4f0f618b76b49e8c4bfe8a35648ee6128cfdb5b1;hb=eac461c1f1ca91cfe282c779291d582ed6b336cb;hp=24daaae10e51ac2a31df06e014b7a74abab8ff11;hpb=409fcc671231b594ec010adf683f72a871ec1d6a;p=sbcl.git diff --git a/src/runtime/thread.c b/src/runtime/thread.c index 24daaae..4f0f618 100644 --- a/src/runtime/thread.c +++ b/src/runtime/thread.c @@ -17,7 +17,7 @@ #ifndef LISP_FEATURE_WIN32 #include #endif -#include +#include "runtime.h" #include #include #include @@ -33,7 +33,6 @@ #include "runtime.h" #include "validate.h" /* for BINDING_STACK_SIZE etc */ -#include "alloc.h" #include "thread.h" #include "arch.h" #include "target-arch-os.h" @@ -43,14 +42,15 @@ #include "genesis/cons.h" #include "genesis/fdefn.h" #include "interr.h" /* for lose() */ +#include "alloc.h" #include "gc-internal.h" +#include "cpputil.h" +#include "pseudo-atomic.h" +#include "interrupt.h" +#include "lispregs.h" -#ifdef LISP_FEATURE_WIN32 -/* - * Win32 doesn't have SIGSTKSZ, and we're not switching stacks anyway, - * so define it arbitrarily - */ -#define SIGSTKSZ 1024 +#if defined(LISP_FEATURE_WIN32) && defined(LISP_FEATURE_SB_THREAD) +# define IMMEDIATE_POST_MORTEM #endif #if defined(LISP_FEATURE_DARWIN) && defined(LISP_FEATURE_SB_THREAD) @@ -63,8 +63,6 @@ #define LOCK_CREATE_THREAD #endif -#define ALIEN_STACK_SIZE (1*1024*1024) /* 1Mb size chosen at random */ - #ifdef LISP_FEATURE_SB_THREAD struct thread_post_mortem { #ifdef DELAY_THREAD_POST_MORTEM @@ -94,6 +92,7 @@ static pthread_mutex_t create_thread_lock = PTHREAD_MUTEX_INITIALIZER; #ifdef LISP_FEATURE_GCC_TLS __thread struct thread *current_thread; #endif +pthread_key_t lisp_thread = 0; #endif #if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) @@ -120,6 +119,80 @@ unlink_thread(struct thread *th) if (th->next) th->next->prev = th->prev; } + +/* Only access thread state with blockables blocked. */ +lispobj +thread_state(struct thread *thread) +{ + lispobj state; + sigset_t old; + block_blockable_signals(NULL, &old); + os_sem_wait(thread->state_sem, "thread_state"); + state = thread->state; + os_sem_post(thread->state_sem, "thread_state"); + thread_sigmask(SIG_SETMASK, &old, NULL); + return state; +} + +void +set_thread_state(struct thread *thread, lispobj state) +{ + int i, waitcount = 0; + sigset_t old; + block_blockable_signals(NULL, &old); + os_sem_wait(thread->state_sem, "set_thread_state"); + if (thread->state != state) { + if ((STATE_STOPPED==state) || + (STATE_DEAD==state)) { + waitcount = thread->state_not_running_waitcount; + thread->state_not_running_waitcount = 0; + for (i=0; istate_not_running_sem, "set_thread_state (not running)"); + } + if ((STATE_RUNNING==state) || + (STATE_DEAD==state)) { + waitcount = thread->state_not_stopped_waitcount; + thread->state_not_stopped_waitcount = 0; + for (i=0; istate_not_stopped_sem, "set_thread_state (not stopped)"); + } + thread->state = state; + } + os_sem_post(thread->state_sem, "set_thread_state"); + thread_sigmask(SIG_SETMASK, &old, NULL); +} + +void +wait_for_thread_state_change(struct thread *thread, lispobj state) +{ + sigset_t old; + os_sem_t *wait_sem; + block_blockable_signals(NULL, &old); + start: + os_sem_wait(thread->state_sem, "wait_for_thread_state_change"); + if (thread->state == state) { + switch (state) { + case STATE_RUNNING: + wait_sem = thread->state_not_running_sem; + thread->state_not_running_waitcount++; + break; + case STATE_STOPPED: + wait_sem = thread->state_not_stopped_sem; + thread->state_not_stopped_waitcount++; + break; + default: + lose("Invalid state in wait_for_thread_state_change: "OBJ_FMTX"\n", state); + } + } else { + wait_sem = NULL; + } + os_sem_post(thread->state_sem, "wait_for_thread_state_change"); + if (wait_sem) { + os_sem_wait(wait_sem, "wait_for_thread_state_change"); + goto start; + } + thread_sigmask(SIG_SETMASK, &old, NULL); +} #endif static int @@ -129,14 +202,31 @@ initial_thread_trampoline(struct thread *th) #if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) lispobj *args = NULL; #endif +#ifdef LISP_FEATURE_SB_THREAD + pthread_setspecific(lisp_thread, (void *)1); +#endif +#if defined(THREADS_USING_GCSIGNAL) && defined(LISP_FEATURE_PPC) + /* SIG_STOP_FOR_GC defaults to blocked on PPC? */ + unblock_gc_signals(0,0); +#endif function = th->no_tls_value_marker; th->no_tls_value_marker = NO_TLS_VALUE_MARKER_WIDETAG; if(arch_os_thread_init(th)==0) return 1; +#ifdef LISP_FEATURE_SB_SAFEPOINT + pthread_mutex_lock(thread_qrl(th)); +#endif link_thread(th); th->os_thread=thread_self(); #ifndef LISP_FEATURE_WIN32 - protect_control_stack_guard_page(1); + protect_control_stack_hard_guard_page(1, NULL); #endif + protect_binding_stack_hard_guard_page(1, NULL); + protect_alien_stack_hard_guard_page(1, NULL); +#ifndef LISP_FEATURE_WIN32 + protect_control_stack_guard_page(1, NULL); +#endif + protect_binding_stack_guard_page(1, NULL); + protect_alien_stack_guard_page(1, NULL); #if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) return call_into_lisp_first_time(function,args,0); @@ -146,20 +236,28 @@ initial_thread_trampoline(struct thread *th) } #ifdef LISP_FEATURE_SB_THREAD -#define THREAD_STATE_LOCK_SIZE \ - (sizeof(pthread_mutex_t))+(sizeof(pthread_cond_t)) + +# if defined(IMMEDIATE_POST_MORTEM) + +/* + * If this feature is set, we are running on a stack managed by the OS, + * and no fancy delays are required for anything. Just do it. + */ +static void +schedule_thread_post_mortem(struct thread *corpse) +{ + pthread_detach(pthread_self()); + gc_assert(!pthread_attr_destroy(corpse->os_attr)); + free(corpse->os_attr); +#if defined(LISP_FEATURE_WIN32) + os_invalidate_free(corpse->os_address, THREAD_STRUCT_SIZE); #else -#define THREAD_STATE_LOCK_SIZE 0 + os_invalidate(corpse->os_address, THREAD_STRUCT_SIZE); #endif +} -#define THREAD_STRUCT_SIZE (thread_control_stack_size + BINDING_STACK_SIZE + \ - ALIEN_STACK_SIZE + \ - THREAD_STATE_LOCK_SIZE + \ - dynamic_values_bytes + \ - 32 * SIGSTKSZ + \ - THREAD_ALIGNMENT_BYTES) +# else -#ifdef LISP_FEATURE_SB_THREAD /* THREAD POST MORTEM CLEANUP * * Memory allocated for the thread stacks cannot be reclaimed while @@ -246,6 +344,8 @@ schedule_thread_post_mortem(struct thread *corpse) } } +# endif /* !IMMEDIATE_POST_MORTEM */ + /* this is the first thing that runs in the child (which is why the * silly calling convention). Basically it calls the user's requested * lisp function after doing arch_os_thread_init and whatever other @@ -258,6 +358,11 @@ new_thread_trampoline(struct thread *th) int result, lock_ret; FSHOW((stderr,"/creating thread %lu\n", thread_self())); + check_deferrables_blocked_or_lose(0); +#ifndef LISP_FEATURE_SB_SAFEPOINT + check_gc_signals_unblocked_or_lose(0); +#endif + pthread_setspecific(lisp_thread, (void *)1); function = th->no_tls_value_marker; th->no_tls_value_marker = NO_TLS_VALUE_MARKER_WIDETAG; if(arch_os_thread_init(th)==0) { @@ -266,21 +371,44 @@ new_thread_trampoline(struct thread *th) } th->os_thread=thread_self(); - protect_control_stack_guard_page(1); + protect_control_stack_guard_page(1, NULL); + protect_binding_stack_guard_page(1, NULL); + protect_alien_stack_guard_page(1, NULL); /* Since GC can only know about this thread from the all_threads - * list and we're just adding this thread to it there is no danger - * of deadlocking even with SIG_STOP_FOR_GC blocked (which it is - * not). */ + * list and we're just adding this thread to it, there is no + * danger of deadlocking even with SIG_STOP_FOR_GC blocked (which + * it is not). */ +#ifdef LISP_FEATURE_SB_SAFEPOINT + *th->csp_around_foreign_call = (lispobj)&function; + pthread_mutex_lock(thread_qrl(th)); +#endif lock_ret = pthread_mutex_lock(&all_threads_lock); gc_assert(lock_ret == 0); link_thread(th); lock_ret = pthread_mutex_unlock(&all_threads_lock); gc_assert(lock_ret == 0); + /* Kludge: Changed the order of some steps between the safepoint/ + * non-safepoint versions of this code. Can we unify this more? + */ +#ifdef LISP_FEATURE_SB_SAFEPOINT + WITH_GC_AT_SAFEPOINTS_ONLY() { + result = funcall0(function); + block_blockable_signals(0, 0); + gc_alloc_update_page_tables(BOXED_PAGE_FLAG, &th->alloc_region); + } + lock_ret = pthread_mutex_lock(&all_threads_lock); + gc_assert(lock_ret == 0); + unlink_thread(th); + lock_ret = pthread_mutex_unlock(&all_threads_lock); + gc_assert(lock_ret == 0); + pthread_mutex_unlock(thread_qrl(th)); + set_thread_state(th,STATE_DEAD); +#else result = funcall0(function); /* Block GC */ - block_blockable_signals(); + block_blockable_signals(0, 0); set_thread_state(th, STATE_DEAD); /* SIG_STOP_FOR_GC is blocked and GC might be waiting for this @@ -292,23 +420,32 @@ new_thread_trampoline(struct thread *th) unlink_thread(th); pthread_mutex_unlock(&all_threads_lock); gc_assert(lock_ret == 0); +#endif if(th->tls_cookie>=0) arch_os_thread_cleanup(th); - pthread_mutex_destroy(th->state_lock); - pthread_cond_destroy(th->state_cond); + os_sem_destroy(th->state_sem); + os_sem_destroy(th->state_not_running_sem); + os_sem_destroy(th->state_not_stopped_sem); +#if defined(LISP_FEATURE_WIN32) + free((os_vm_address_t)th->interrupt_data); +#else os_invalidate((os_vm_address_t)th->interrupt_data, (sizeof (struct interrupt_data))); +#endif #ifdef LISP_FEATURE_MACH_EXCEPTION_HANDLER - FSHOW((stderr, "Deallocating mach port %x\n", THREAD_STRUCT_TO_EXCEPTION_PORT(th))); - mach_port_move_member(mach_task_self(), - THREAD_STRUCT_TO_EXCEPTION_PORT(th), - MACH_PORT_NULL); - mach_port_deallocate(mach_task_self(), - THREAD_STRUCT_TO_EXCEPTION_PORT(th)); - mach_port_destroy(mach_task_self(), - THREAD_STRUCT_TO_EXCEPTION_PORT(th)); + mach_lisp_thread_destroy(th); +#endif + +#if defined(LISP_FEATURE_WIN32) + int i; + for (i = 0; i< + (int) (sizeof(th->private_events.events)/ + sizeof(th->private_events.events[0])); ++i) { + CloseHandle(th->private_events.events[i]); + } + TlsSetValue(OUR_TLS_INDEX,NULL); #endif schedule_thread_post_mortem(th); @@ -321,13 +458,28 @@ new_thread_trampoline(struct thread *th) static void free_thread_struct(struct thread *th) { +#if defined(LISP_FEATURE_WIN32) + if (th->interrupt_data) { + os_invalidate_free((os_vm_address_t) th->interrupt_data, + (sizeof (struct interrupt_data))); + } + os_invalidate_free((os_vm_address_t) th->os_address, + THREAD_STRUCT_SIZE); +#else if (th->interrupt_data) os_invalidate((os_vm_address_t) th->interrupt_data, (sizeof (struct interrupt_data))); os_invalidate((os_vm_address_t) th->os_address, THREAD_STRUCT_SIZE); +#endif } +#ifdef LISP_FEATURE_SB_THREAD +/* FIXME: should be MAX_INTERRUPTS -1 ? */ +const unsigned int tls_index_start = + MAX_INTERRUPTS + sizeof(struct thread)/sizeof(lispobj); +#endif + /* this is called from any other thread to create the new one, and * initialize all parts of it that can be initialized from another * thread @@ -339,7 +491,7 @@ create_thread_struct(lispobj initial_function) { struct thread *th=0; /* subdue gcc */ void *spaces=0; void *aligned_spaces=0; -#ifdef LISP_FEATURE_SB_THREAD +#if defined(LISP_FEATURE_SB_THREAD) || defined(LISP_FEATURE_WIN32) unsigned int i; #endif @@ -359,35 +511,37 @@ create_thread_struct(lispobj initial_function) { aligned_spaces = (void *)((((unsigned long)(char *)spaces) + THREAD_ALIGNMENT_BYTES-1) &~(unsigned long)(THREAD_ALIGNMENT_BYTES-1)); - per_thread=(union per_thread_data *) + void* csp_page= (aligned_spaces+ thread_control_stack_size+ BINDING_STACK_SIZE+ - ALIEN_STACK_SIZE + - THREAD_STATE_LOCK_SIZE); + ALIEN_STACK_SIZE); + per_thread=(union per_thread_data *) + (csp_page + THREAD_CSP_PAGE_SIZE); + struct nonpointer_thread_data *nonpointer_data + = (void *) &per_thread->dynamic_values[TLS_SIZE]; #ifdef LISP_FEATURE_SB_THREAD for(i = 0; i < (dynamic_values_bytes / sizeof(lispobj)); i++) per_thread->dynamic_values[i] = NO_TLS_VALUE_MARKER_WIDETAG; if (all_threads == 0) { if(SymbolValue(FREE_TLS_INDEX,0)==UNBOUND_MARKER_WIDETAG) { - SetSymbolValue - (FREE_TLS_INDEX, - /* FIXME: should be MAX_INTERRUPTS -1 ? */ - make_fixnum(MAX_INTERRUPTS+ - sizeof(struct thread)/sizeof(lispobj)), - 0); + SetSymbolValue(FREE_TLS_INDEX,tls_index_start << WORD_SHIFT,0); SetSymbolValue(TLS_INDEX_LOCK,make_fixnum(0),0); } #define STATIC_TLS_INIT(sym,field) \ ((struct symbol *)(sym-OTHER_POINTER_LOWTAG))->tls_index= \ - make_fixnum(THREAD_SLOT_OFFSET_WORDS(field)) + (THREAD_SLOT_OFFSET_WORDS(field) << WORD_SHIFT) STATIC_TLS_INIT(BINDING_STACK_START,binding_stack_start); +#ifdef BINDING_STACK_POINTER STATIC_TLS_INIT(BINDING_STACK_POINTER,binding_stack_pointer); +#endif STATIC_TLS_INIT(CONTROL_STACK_START,control_stack_start); STATIC_TLS_INIT(CONTROL_STACK_END,control_stack_end); +#ifdef ALIEN_STACK STATIC_TLS_INIT(ALIEN_STACK,alien_stack_pointer); +#endif #if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64) STATIC_TLS_INIT(PSEUDO_ATOMIC_BITS,pseudo_atomic_bits); #endif @@ -401,19 +555,36 @@ create_thread_struct(lispobj initial_function) { th->binding_stack_start= (lispobj*)((void*)th->control_stack_start+thread_control_stack_size); th->control_stack_end = th->binding_stack_start; + th->control_stack_guard_page_protected = T; th->alien_stack_start= (lispobj*)((void*)th->binding_stack_start+BINDING_STACK_SIZE); - th->binding_stack_pointer=th->binding_stack_start; + set_binding_stack_pointer(th,th->binding_stack_start); th->this=th; th->os_thread=0; + +#ifdef LISP_FEATURE_SB_SAFEPOINT + th->pc_around_foreign_call = 0; + th->csp_around_foreign_call = csp_page; +#endif + #ifdef LISP_FEATURE_SB_THREAD + /* Contrary to the "allocate all the spaces at once" comment above, + * the os_attr is allocated separately. We cannot put it into the + * nonpointer data, because it's used for post_mortem and freed + * separately */ th->os_attr=malloc(sizeof(pthread_attr_t)); - th->state_lock=(pthread_mutex_t *)((void *)th->alien_stack_start + - ALIEN_STACK_SIZE); - pthread_mutex_init(th->state_lock, NULL); - th->state_cond=(pthread_cond_t *)((void *)th->state_lock + - (sizeof(pthread_mutex_t))); - pthread_cond_init(th->state_cond, NULL); + th->nonpointer_data = nonpointer_data; + th->state_sem=&nonpointer_data->state_sem; + th->state_not_running_sem=&nonpointer_data->state_not_running_sem; + th->state_not_stopped_sem=&nonpointer_data->state_not_stopped_sem; + th->state_not_running_waitcount = 0; + th->state_not_stopped_waitcount = 0; + os_sem_init(th->state_sem, 1); + os_sem_init(th->state_not_running_sem, 0); + os_sem_init(th->state_not_stopped_sem, 0); +# ifdef LISP_FEATURE_SB_SAFEPOINT + pthread_mutex_init(thread_qrl(th), NULL); +# endif #endif th->state=STATE_RUNNING; #ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD @@ -422,12 +593,22 @@ create_thread_struct(lispobj initial_function) { #else th->alien_stack_pointer=((void *)th->alien_stack_start); #endif -#if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64) +#if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64) || defined(LISP_FEATURE_SB_THREAD) th->pseudo_atomic_bits=0; #endif #ifdef LISP_FEATURE_GENCGC gc_set_region_empty(&th->alloc_region); #endif +#ifdef LISP_FEATURE_SB_THREAD + /* This parallels the same logic in globals.c for the + * single-threaded foreign_function_call_active, KLUDGE and + * all. */ +#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) + th->foreign_function_call_active = 0; +#else + th->foreign_function_call_active = 1; +#endif +#endif #ifndef LISP_FEATURE_SB_THREAD /* the tls-points-into-struct-thread trick is only good for threaded @@ -440,12 +621,8 @@ create_thread_struct(lispobj initial_function) { SetSymbolValue(CONTROL_STACK_START,(lispobj)th->control_stack_start,th); SetSymbolValue(CONTROL_STACK_END,(lispobj)th->control_stack_end,th); #if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64) - SetSymbolValue(BINDING_STACK_POINTER,(lispobj)th->binding_stack_pointer,th); SetSymbolValue(ALIEN_STACK,(lispobj)th->alien_stack_pointer,th); SetSymbolValue(PSEUDO_ATOMIC_BITS,(lispobj)th->pseudo_atomic_bits,th); -#else - current_binding_stack_pointer=th->binding_stack_pointer; - current_control_stack_pointer=th->control_stack_start; #endif #endif bind_variable(CURRENT_CATCH_BLOCK,make_fixnum(0),th); @@ -456,35 +633,59 @@ create_thread_struct(lispobj initial_function) { bind_variable(ALLOW_WITH_INTERRUPTS,T,th); bind_variable(GC_PENDING,NIL,th); bind_variable(ALLOC_SIGNAL,NIL,th); +#ifdef PINNED_OBJECTS + bind_variable(PINNED_OBJECTS,NIL,th); +#endif #ifdef LISP_FEATURE_SB_THREAD bind_variable(STOP_FOR_GC_PENDING,NIL,th); #endif +#if defined(LISP_FEATURE_SB_SAFEPOINT) + bind_variable(GC_SAFE,NIL,th); + bind_variable(IN_SAFEPOINT,NIL,th); +#endif +#ifdef LISP_FEATURE_SB_THRUPTION + bind_variable(THRUPTION_PENDING,NIL,th); + bind_variable(RESTART_CLUSTERS,NIL,th); +#endif +#ifndef LISP_FEATURE_C_STACK_IS_CONTROL_STACK + access_control_stack_pointer(th)=th->control_stack_start; +#endif +#if defined(LISP_FEATURE_WIN32) + th->interrupt_data = (struct interrupt_data *) + calloc((sizeof (struct interrupt_data)),1); +#else th->interrupt_data = (struct interrupt_data *) os_validate(0,(sizeof (struct interrupt_data))); +#endif if (!th->interrupt_data) { free_thread_struct(th); return 0; } th->interrupt_data->pending_handler = 0; + th->interrupt_data->gc_blocked_deferrables = 0; +#ifdef GENCGC_IS_PRECISE + th->interrupt_data->allocation_trap_context = 0; +#endif th->no_tls_value_marker=initial_function; +#if defined(LISP_FEATURE_WIN32) + for (i = 0; iprivate_events.events)/ + sizeof(th->private_events.events[0]); ++i) { + th->private_events.events[i] = CreateEvent(NULL,FALSE,FALSE,NULL); + } + th->synchronous_io_handle_and_flag = 0; +#endif th->stepping = NIL; return th; } -#ifdef LISP_FEATURE_MACH_EXCEPTION_HANDLER -mach_port_t setup_mach_exception_handling_thread(); -kern_return_t mach_thread_init(mach_port_t thread_exception_port); - -#endif - void create_initial_thread(lispobj initial_function) { struct thread *th=create_thread_struct(initial_function); - if(th) { -#ifdef LISP_FEATURE_MACH_EXCEPTION_HANDLER - setup_mach_exception_handling_thread(); +#ifdef LISP_FEATURE_SB_THREAD + pthread_key_create(&lisp_thread, 0); #endif + if(th) { initial_thread_trampoline(th); /* no return */ } else lose("can't create initial thread\n"); } @@ -500,100 +701,70 @@ boolean create_os_thread(struct thread *th,os_thread_t *kid_tid) { /* The new thread inherits the restrictive signal mask set here, * and enables signals again when it is set up properly. */ - sigset_t newset,oldset; + sigset_t oldset; boolean r=1; int retcode = 0, initcode; FSHOW_SIGNAL((stderr,"/create_os_thread: creating new thread\n")); + /* Blocking deferrable signals is enough, no need to block + * SIG_STOP_FOR_GC because the child process is not linked onto + * all_threads until it's ready. */ + block_deferrable_signals(0, &oldset); + #ifdef LOCK_CREATE_THREAD retcode = pthread_mutex_lock(&create_thread_lock); gc_assert(retcode == 0); FSHOW_SIGNAL((stderr,"/create_os_thread: got lock\n")); #endif - sigemptyset(&newset); - /* Blocking deferrable signals is enough, no need to block - * SIG_STOP_FOR_GC because the child process is not linked onto - * all_threads until it's ready. */ - sigaddset_deferrable(&newset); - thread_sigmask(SIG_BLOCK, &newset, &oldset); if((initcode = pthread_attr_init(th->os_attr)) || - /* call_into_lisp_first_time switches the stack for the initial thread. For the - * others, we use this. */ - (pthread_attr_setstack(th->os_attr,th->control_stack_start,thread_control_stack_size)) || + /* call_into_lisp_first_time switches the stack for the initial + * thread. For the others, we use this. */ +#if defined(LISP_FEATURE_WIN32) + (pthread_attr_setstacksize(th->os_attr, thread_control_stack_size)) || +#else + (pthread_attr_setstack(th->os_attr,th->control_stack_start, + thread_control_stack_size)) || +#endif (retcode = pthread_create (kid_tid,th->os_attr,(void *(*)(void *))new_thread_trampoline,th))) { FSHOW_SIGNAL((stderr, "init = %d\n", initcode)); - FSHOW_SIGNAL((stderr, printf("pthread_create returned %d, errno %d\n", retcode, errno))); + FSHOW_SIGNAL((stderr, "pthread_create returned %d, errno %d\n", + retcode, errno)); if(retcode < 0) { perror("create_os_thread"); } r=0; } - thread_sigmask(SIG_SETMASK,&oldset,0); #ifdef LOCK_CREATE_THREAD retcode = pthread_mutex_unlock(&create_thread_lock); gc_assert(retcode == 0); FSHOW_SIGNAL((stderr,"/create_os_thread: released lock\n")); #endif + thread_sigmask(SIG_SETMASK,&oldset,0); return r; } os_thread_t create_thread(lispobj initial_function) { - struct thread *th; - os_thread_t kid_tid; + struct thread *th, *thread = arch_os_get_current_thread(); + os_thread_t kid_tid = 0; + + /* Must defend against async unwinds. */ + if (SymbolValue(INTERRUPTS_ENABLED, thread) != NIL) + lose("create_thread is not safe when interrupts are enabled.\n"); /* Assuming that a fresh thread struct has no lisp objects in it, * linking it to all_threads can be left to the thread itself * without fear of gc lossage. initial_function violates this * assumption and must stay pinned until the child starts up. */ th = create_thread_struct(initial_function); - if(th==0) return 0; - - if (create_os_thread(th,&kid_tid)) { - return kid_tid; - } else { + if (th && !create_os_thread(th,&kid_tid)) { free_thread_struct(th); - return 0; - } -} - -/* Send the signo to os_thread, retry if the rt signal queue is - * full. */ -int -kill_thread_safely(os_thread_t os_thread, int signo) -{ - int r; - /* The man page does not mention EAGAIN as a valid return value - * for either pthread_kill or kill. But that's theory, this is - * practice. By waiting here we assume that the delivery of this - * signal is not necessary for the delivery of the signals in the - * queue. In other words, we _assume_ there are no deadlocks. */ - while ((r=pthread_kill(os_thread,signo))==EAGAIN) { - /* wait a bit then try again in the hope of the rt signal - * queue not being full */ - FSHOW_SIGNAL((stderr,"/rt signal queue full\n")); - /* FIXME: some kind of backoff (random, exponential) would be - * nice. */ - sleep(1); - } - return r; -} - -int signal_interrupt_thread(os_thread_t os_thread) -{ - int status = kill_thread_safely(os_thread, SIG_INTERRUPT_THREAD); - FSHOW_SIGNAL((stderr,"/signal_interrupt_thread: %lu\n", os_thread)); - if (status == 0) { - return 0; - } else if (status == ESRCH) { - return -1; - } else { - lose("cannot send SIG_INTERRUPT_THREAD to thread=%lu: %d, %s\n", - os_thread, status, strerror(status)); + kid_tid = 0; } + return kid_tid; } /* stopping the world is a two-stage process. From this thread we signal @@ -601,6 +772,10 @@ int signal_interrupt_thread(os_thread_t os_thread) * the usual pseudo-atomic checks (we don't want to stop a thread while * it's in the middle of allocation) then waits for another SIG_STOP_FOR_GC. */ +/* + * (With SB-SAFEPOINT, see the definitions in safepoint.c instead.) + */ +#ifndef LISP_FEATURE_SB_SAFEPOINT /* To avoid deadlocks when gc stops the world all clients of each * mutex must enable or disable SIG_STOP_FOR_GC for the duration of @@ -631,6 +806,8 @@ void gc_stop_the_world() if((p!=th) && ((thread_state(p)==STATE_RUNNING))) { FSHOW_SIGNAL((stderr,"/gc_stop_the_world: suspending thread %lu\n", p->os_thread)); + /* We already hold all_thread_lock, P can become DEAD but + * cannot exit, ergo it's safe to use pthread_kill. */ status=pthread_kill(p->os_thread,SIG_STOP_FOR_GC); if (status==ESRCH) { /* This thread has exited. */ @@ -670,7 +847,7 @@ void gc_start_the_world() if (p!=th) { lispobj state = thread_state(p); if (state != STATE_DEAD) { - if(state != STATE_SUSPENDED) { + if(state != STATE_STOPPED) { lose("gc_start_the_world: wrong thread state is %d\n", fixnum_value(state)); } @@ -690,7 +867,9 @@ void gc_start_the_world() FSHOW_SIGNAL((stderr,"/gc_start_the_world:end\n")); } -#endif + +#endif /* !LISP_FEATURE_SB_SAFEPOINT */ +#endif /* !LISP_FEATURE_SB_THREAD */ int thread_yield() @@ -701,3 +880,108 @@ thread_yield() return 0; #endif } + +int +wake_thread(os_thread_t os_thread) +{ +#if defined(LISP_FEATURE_WIN32) + return kill_safely(os_thread, 1); +#elif !defined(LISP_FEATURE_SB_THRUPTION) + return kill_safely(os_thread, SIGPIPE); +#else + return wake_thread_posix(os_thread); +#endif +} + +/* If the thread id given does not belong to a running thread (it has + * exited or never even existed) pthread_kill _may_ fail with ESRCH, + * but it is also allowed to just segfault, see + * . + * + * Relying on thread ids can easily backfire since ids are recycled + * (NPTL recycles them extremely fast) so a signal can be sent to + * another process if the one it was sent to exited. + * + * For these reasons, we must make sure that the thread is still alive + * when the pthread_kill is called and return if the thread is + * exiting. + * + * Note (DFL, 2011-06-22): At the time of writing, this function is only + * used for INTERRUPT-THREAD, hence the wake_thread special-case for + * Windows is OK. */ +int +kill_safely(os_thread_t os_thread, int signal) +{ + FSHOW_SIGNAL((stderr,"/kill_safely: %lu, %d\n", os_thread, signal)); + { +#ifdef LISP_FEATURE_SB_THREAD + sigset_t oldset; + struct thread *thread; + /* Frequent special case: resignalling to self. The idea is + * that leave_region safepoint will acknowledge the signal, so + * there is no need to take locks, roll thread to safepoint + * etc. */ + /* Kludge (on safepoint builds): At the moment, this isn't just + * an optimization; rather it masks the fact that + * gc_stop_the_world() grabs the all_threads mutex without + * releasing it, and since we're not using recursive pthread + * mutexes, the pthread_mutex_lock() around the all_threads loop + * would go wrong. Why are we running interruptions while + * stopping the world though? Test case is (:ASYNC-UNWIND + * :SPECIALS), especially with s/10/100/ in both loops. */ + if (os_thread == pthread_self()) { + pthread_kill(os_thread, signal); +#ifdef LISP_FEATURE_WIN32 + check_pending_thruptions(NULL); +#endif + return 0; + } + + /* pthread_kill is not async signal safe and we don't want to be + * interrupted while holding the lock. */ + block_deferrable_signals(0, &oldset); + pthread_mutex_lock(&all_threads_lock); + for (thread = all_threads; thread; thread = thread->next) { + if (thread->os_thread == os_thread) { + int status = pthread_kill(os_thread, signal); + if (status) + lose("kill_safely: pthread_kill failed with %d\n", status); +#if defined(LISP_FEATURE_WIN32) && defined(LISP_FEATURE_SB_THRUPTION) + wake_thread_win32(thread); +#endif + break; + } + } + pthread_mutex_unlock(&all_threads_lock); + thread_sigmask(SIG_SETMASK,&oldset,0); + if (thread) + return 0; + else + return -1; +#elif defined(LISP_FEATURE_WIN32) + return 0; +#else + int status; + if (os_thread != 0) + lose("kill_safely: who do you want to kill? %d?\n", os_thread); + /* Dubious (as in don't know why it works) workaround for the + * signal sometimes not being generated on darwin. */ +#ifdef LISP_FEATURE_DARWIN + { + sigset_t oldset; + sigprocmask(SIG_BLOCK, &deferrable_sigset, &oldset); + status = raise(signal); + sigprocmask(SIG_SETMASK,&oldset,0); + } +#else + status = raise(signal); +#endif + if (status == 0) { + return 0; + } else { + lose("cannot raise signal %d, %d %s\n", + signal, status, strerror(errno)); + } +#endif + } +}