X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fthread.c;h=a30ff4ffb2681778610a10b6318cb01426a06df7;hb=ed1910efb36f71b5ebe33b5ffffd7195e15644de;hp=1e8402ab77b6d819591a197ad991ef8db46fe7f0;hpb=8340bf74c31b29e9552ef8f705b6e1298547c6ab;p=sbcl.git diff --git a/src/runtime/thread.c b/src/runtime/thread.c index 1e8402a..a30ff4f 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 @@ -44,13 +44,13 @@ #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) @@ -119,7 +119,83 @@ unlink_thread(struct thread *th) if (th->next) th->next->prev = th->prev; } -#endif + +#ifndef LISP_FEATURE_SB_SAFEPOINT +/* 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 /* sb-safepoint */ +#endif /* sb-thread */ static int initial_thread_trampoline(struct thread *th) @@ -131,7 +207,7 @@ initial_thread_trampoline(struct thread *th) #ifdef LISP_FEATURE_SB_THREAD pthread_setspecific(lisp_thread, (void *)1); #endif -#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_PPC) +#if defined(THREADS_USING_GCSIGNAL) && defined(LISP_FEATURE_PPC) /* SIG_STOP_FOR_GC defaults to blocked on PPC? */ unblock_gc_signals(0,0); #endif @@ -142,12 +218,14 @@ initial_thread_trampoline(struct thread *th) th->os_thread=thread_self(); #ifndef LISP_FEATURE_WIN32 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); -#endif #if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) return call_into_lisp_first_time(function,args,0); @@ -157,20 +235,28 @@ initial_thread_trampoline(struct thread *th) } #ifdef LISP_FEATURE_SB_THREAD -#define THREAD_STATE_LOCK_SIZE \ - ((sizeof(os_sem_t))+(sizeof(os_sem_t))+(sizeof(os_sem_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 @@ -257,6 +343,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 @@ -270,7 +358,9 @@ new_thread_trampoline(struct thread *th) 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; @@ -287,12 +377,33 @@ new_thread_trampoline(struct thread *th) * 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; +#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 + gc_state_lock(); + gc_state_wait(GC_NONE); + gc_state_unlock(); + 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); +#else result = funcall0(function); /* Block GC */ @@ -308,24 +419,34 @@ 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); +#ifndef LISP_FEATURE_SB_SAFEPOINT os_sem_destroy(th->state_sem); os_sem_destroy(th->state_not_running_sem); os_sem_destroy(th->state_not_stopped_sem); +#endif +#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(current_mach_task, - THREAD_STRUCT_TO_EXCEPTION_PORT(th), - MACH_PORT_NULL); - mach_port_deallocate(current_mach_task, - THREAD_STRUCT_TO_EXCEPTION_PORT(th)); - mach_port_destroy(current_mach_task, - 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); @@ -338,11 +459,20 @@ 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 @@ -362,7 +492,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 @@ -382,12 +512,15 @@ 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++) @@ -429,18 +562,29 @@ create_thread_struct(lispobj initial_function) { 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_sem=(os_sem_t *)((void *)th->alien_stack_start + ALIEN_STACK_SIZE); - th->state_not_running_sem=(os_sem_t *) - ((void *)th->state_sem + (sizeof(os_sem_t))); - th->state_not_stopped_sem=(os_sem_t *) - ((void *)th->state_not_running_sem + (sizeof(os_sem_t))); - th->state_not_running_waitcount = 0; - th->state_not_stopped_waitcount = 0; + th->nonpointer_data = nonpointer_data; +# ifndef LISP_FEATURE_SB_SAFEPOINT + 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; 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); +# endif + th->state_not_running_waitcount = 0; + th->state_not_stopped_waitcount = 0; #endif th->state=STATE_RUNNING; #ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD @@ -495,33 +639,47 @@ create_thread_struct(lispobj initial_function) { #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 LISP_FEATURE_PPC +#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); #ifdef LISP_FEATURE_SB_THREAD @@ -563,8 +721,12 @@ boolean create_os_thread(struct thread *th,os_thread_t *kid_tid) 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. */ +#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)); @@ -610,6 +772,10 @@ os_thread_t create_thread(lispobj initial_function) { * 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 @@ -701,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() @@ -713,6 +881,18 @@ thread_yield() #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 @@ -722,13 +902,13 @@ thread_yield() * (NPTL recycles them extremely fast) so a signal can be sent to * another process if the one it was sent to exited. * - * We send signals in two places: signal_interrupt_thread sends a - * signal that's harmless if delivered to another thread, but - * SIG_STOP_FOR_GC is fatal. - * * 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. */ + * 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) { @@ -737,6 +917,26 @@ kill_safely(os_thread_t os_thread, int 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); @@ -746,6 +946,9 @@ kill_safely(os_thread_t os_thread, int signal) 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; } } @@ -755,6 +958,8 @@ kill_safely(os_thread_t os_thread, int signal) return 0; else return -1; +#elif defined(LISP_FEATURE_WIN32) + return 0; #else int status; if (os_thread != 0)