X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fthread.c;h=1889213ef3cf0bc72bf9214adcd78e469598a400;hb=4ba392170e98744f0ef0b8e08a5d42b988f1d0c9;hp=4f0f618b76b49e8c4bfe8a35648ee6128cfdb5b1;hpb=3f85a9ec737176a4543f64f8f0cc08500ce23106;p=sbcl.git diff --git a/src/runtime/thread.c b/src/runtime/thread.c index 4f0f618..1889213 100644 --- a/src/runtime/thread.c +++ b/src/runtime/thread.c @@ -96,7 +96,11 @@ pthread_key_t lisp_thread = 0; #endif #if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) -extern lispobj call_into_lisp_first_time(lispobj fun, lispobj *args, int nargs); +extern lispobj call_into_lisp_first_time(lispobj fun, lispobj *args, int nargs) +# ifdef LISP_FEATURE_X86_64 + __attribute__((sysv_abi)) +# endif + ; #endif static void @@ -120,6 +124,7 @@ unlink_thread(struct thread *th) th->next->prev = th->prev; } +#ifndef LISP_FEATURE_SB_SAFEPOINT /* Only access thread state with blockables blocked. */ lispobj thread_state(struct thread *thread) @@ -193,7 +198,8 @@ wait_for_thread_state_change(struct thread *thread, lispobj state) } thread_sigmask(SIG_SETMASK, &old, NULL); } -#endif +#endif /* sb-safepoint */ +#endif /* sb-thread */ static int initial_thread_trampoline(struct thread *th) @@ -212,9 +218,6 @@ initial_thread_trampoline(struct thread *th) 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 @@ -346,32 +349,21 @@ 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 - * bookkeeping needs to be done - */ -int -new_thread_trampoline(struct thread *th) +/* Note: scribble must be stack-allocated */ +static void +init_new_thread(struct thread *th, init_thread_data *scribble, int guardp) { - lispobj function; - int result, lock_ret; + int 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) { /* FIXME: handle error */ lose("arch_os_thread_init failed\n"); } th->os_thread=thread_self(); - protect_control_stack_guard_page(1, NULL); + if (guardp) + 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 @@ -379,8 +371,7 @@ new_thread_trampoline(struct thread *th) * 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)); + *th->csp_around_foreign_call = (lispobj)scribble; #endif lock_ret = pthread_mutex_lock(&all_threads_lock); gc_assert(lock_ret == 0); @@ -392,21 +383,34 @@ new_thread_trampoline(struct thread *th) * 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); - } + gc_state_lock(); + gc_state_wait(GC_NONE); + gc_state_unlock(); + push_gcing_safety(&scribble->safety); +#endif +} + +static void +undo_init_new_thread(struct thread *th, init_thread_data *scribble) +{ + int lock_ret; + + /* 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 + block_blockable_signals(0, 0); + gc_alloc_update_page_tables(BOXED_PAGE_FLAG, &th->alloc_region); +#if defined(LISP_FEATURE_SB_SAFEPOINT_STRICTLY) && !defined(LISP_FEATURE_WIN32) + gc_alloc_update_page_tables(BOXED_PAGE_FLAG, &th->sprof_alloc_region); +#endif + pop_gcing_safety(&scribble->safety); 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(0, 0); set_thread_state(th, STATE_DEAD); @@ -417,15 +421,20 @@ new_thread_trampoline(struct thread *th) gc_assert(lock_ret == 0); gc_alloc_update_page_tables(BOXED_PAGE_FLAG, &th->alloc_region); +#if defined(LISP_FEATURE_SB_SAFEPOINT_STRICTLY) && !defined(LISP_FEATURE_WIN32) + gc_alloc_update_page_tables(BOXED_PAGE_FLAG, &th->sprof_alloc_region); +#endif 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); @@ -448,11 +457,106 @@ new_thread_trampoline(struct thread *th) TlsSetValue(OUR_TLS_INDEX,NULL); #endif + /* Undo the association of the current pthread to its `struct thread', + * such that we can call arch_os_get_current_thread() later in this + * thread and cleanly get back NULL. */ +#ifdef LISP_FEATURE_GCC_TLS + current_thread = NULL; +#else + pthread_setspecific(specials, NULL); +#endif + schedule_thread_post_mortem(th); +} + +/* 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 + * bookkeeping needs to be done + */ +int +new_thread_trampoline(struct thread *th) +{ + int result; + init_thread_data scribble; + + 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 + + lispobj function = th->no_tls_value_marker; + th->no_tls_value_marker = NO_TLS_VALUE_MARKER_WIDETAG; + init_new_thread(th, &scribble, 1); + result = funcall0(function); + undo_init_new_thread(th, &scribble); + FSHOW((stderr,"/exiting thread %lu\n", thread_self())); return result; } +# ifdef LISP_FEATURE_SB_SAFEPOINT +static struct thread *create_thread_struct(lispobj); + +void +attach_os_thread(init_thread_data *scribble) +{ + os_thread_t os = pthread_self(); + odxprint(misc, "attach_os_thread: attaching to %p", os); + + struct thread *th = create_thread_struct(NIL); + block_deferrable_signals(0, &scribble->oldset); + th->no_tls_value_marker = NO_TLS_VALUE_MARKER_WIDETAG; + /* We don't actually want a pthread_attr here, but rather than add + * `if's to the post-mostem, let's just keep that code happy by + * keeping it initialized: */ + pthread_attr_init(th->os_attr); + +#ifndef LISP_FEATURE_WIN32 + /* On windows, arch_os_thread_init will take care of finding the + * stack. */ + pthread_attr_t attr; + int pthread_getattr_np(pthread_t, pthread_attr_t *); + pthread_getattr_np(os, &attr); + void *stack_addr; + size_t stack_size; + pthread_attr_getstack(&attr, &stack_addr, &stack_size); + th->control_stack_start = stack_addr; + th->control_stack_end = (void *) (((uintptr_t) stack_addr) + stack_size); +#endif + + init_new_thread(th, scribble, 0); + + /* We will be calling into Lisp soon, and the functions being called + * recklessly ignore the comment in target-thread which says that we + * must be careful to not cause GC while initializing a new thread. + * Since we first need to create a fresh thread object, it's really + * tempting to just perform such unsafe allocation though. So let's + * at least try to suppress GC before consing, and hope that it + * works: */ + bind_variable(GC_INHIBIT, T, th); + + uword_t stacksize + = (uword_t) th->control_stack_end - (uword_t) th->control_stack_start; + odxprint(misc, "attach_os_thread: attached %p as %p (0x%lx bytes stack)", + os, th, (long) stacksize); +} + +void +detach_os_thread(init_thread_data *scribble) +{ + struct thread *th = arch_os_get_current_thread(); + odxprint(misc, "detach_os_thread: detaching"); + + undo_init_new_thread(th, scribble); + + odxprint(misc, "deattach_os_thread: detached"); + pthread_setspecific(lisp_thread, (void *)0); + thread_sigmask(SIG_SETMASK, &scribble->oldset, 0); +} +# endif /* safepoint */ + #endif /* LISP_FEATURE_SB_THREAD */ static void @@ -508,9 +612,9 @@ create_thread_struct(lispobj initial_function) { return NULL; /* Aligning up is safe as THREAD_STRUCT_SIZE has * THREAD_ALIGNMENT_BYTES padding. */ - aligned_spaces = (void *)((((unsigned long)(char *)spaces) + aligned_spaces = (void *)((((uword_t)(char *)spaces) + THREAD_ALIGNMENT_BYTES-1) - &~(unsigned long)(THREAD_ALIGNMENT_BYTES-1)); + &~(uword_t)(THREAD_ALIGNMENT_BYTES-1)); void* csp_page= (aligned_spaces+ thread_control_stack_size+ @@ -563,7 +667,12 @@ create_thread_struct(lispobj initial_function) { th->os_thread=0; #ifdef LISP_FEATURE_SB_SAFEPOINT +# ifdef LISP_FEATURE_WIN32 + th->carried_base_pointer = 0; +# endif +# ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK th->pc_around_foreign_call = 0; +# endif th->csp_around_foreign_call = csp_page; #endif @@ -574,20 +683,19 @@ create_thread_struct(lispobj initial_function) { * separately */ th->os_attr=malloc(sizeof(pthread_attr_t)); 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; - 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 + 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 +#ifdef ALIEN_STACK_GROWS_DOWNWARD th->alien_stack_pointer=((void *)th->alien_stack_start + ALIEN_STACK_SIZE-N_WORD_BYTES); #else @@ -598,6 +706,9 @@ create_thread_struct(lispobj initial_function) { #endif #ifdef LISP_FEATURE_GENCGC gc_set_region_empty(&th->alloc_region); +# if defined(LISP_FEATURE_SB_SAFEPOINT_STRICTLY) && !defined(LISP_FEATURE_WIN32) + gc_set_region_empty(&th->sprof_alloc_region); +# endif #endif #ifdef LISP_FEATURE_SB_THREAD /* This parallels the same logic in globals.c for the @@ -724,8 +835,13 @@ boolean create_os_thread(struct thread *th,os_thread_t *kid_tid) #if defined(LISP_FEATURE_WIN32) (pthread_attr_setstacksize(th->os_attr, thread_control_stack_size)) || #else +# if defined(LISP_FEATURE_C_STACK_IS_CONTROL_STACK) (pthread_attr_setstack(th->os_attr,th->control_stack_start, thread_control_stack_size)) || +# else + (pthread_attr_setstack(th->os_attr,th->alien_stack_start, + ALIEN_STACK_SIZE)) || +# endif #endif (retcode = pthread_create (kid_tid,th->os_attr,(void *(*)(void *))new_thread_trampoline,th))) {