X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fthread.c;h=a30ff4ffb2681778610a10b6318cb01426a06df7;hb=2f9585060d5fe2c525955d80f34123761ded80fe;hp=0fa1fe79b4e05fe9b4ea4939f41467f0e0c1df94;hpb=1d06300e09f767a38bbe6d5b38232ca334ab1913;p=sbcl.git diff --git a/src/runtime/thread.c b/src/runtime/thread.c index 0fa1fe7..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 @@ -49,12 +49,8 @@ #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) @@ -124,6 +120,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) @@ -197,7 +194,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) @@ -216,19 +214,18 @@ 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 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); @@ -238,6 +235,28 @@ initial_thread_trampoline(struct thread *th) } #ifdef LISP_FEATURE_SB_THREAD + +# 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 + os_invalidate(corpse->os_address, THREAD_STRUCT_SIZE); +#endif +} + +# else + /* THREAD POST MORTEM CLEANUP * * Memory allocated for the thread stacks cannot be reclaimed while @@ -324,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 @@ -358,7 +379,6 @@ new_thread_trampoline(struct thread *th) * 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); @@ -370,6 +390,9 @@ new_thread_trampoline(struct thread *th) * 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); @@ -380,8 +403,6 @@ new_thread_trampoline(struct thread *th) 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); @@ -401,17 +422,33 @@ new_thread_trampoline(struct thread *th) #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 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); FSHOW((stderr,"/exiting thread %lu\n", thread_self())); return result; @@ -422,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 @@ -446,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 @@ -529,17 +575,16 @@ 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 @@ -606,8 +651,13 @@ create_thread_struct(lispobj initial_function) { 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; @@ -619,6 +669,13 @@ create_thread_struct(lispobj initial_function) { #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; } @@ -664,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)); @@ -823,10 +884,9 @@ thread_yield() int wake_thread(os_thread_t os_thread) { -#ifdef LISP_FEATURE_WIN32 -# define SIGPIPE 1 -#endif -#if !defined(LISP_FEATURE_SB_THRUPTION) || defined(LISP_FEATURE_WIN32) +#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); @@ -871,6 +931,9 @@ kill_safely(os_thread_t os_thread, int signal) * :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; } @@ -883,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; } } @@ -892,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)