X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fthread.c;h=e2f8ab1a9cb2cbabe4e75014303def6ebe4af305;hb=22c1de0a40df83bb5628974010a879cb2c17ff53;hp=40d3afebf7640e7f9e9c600271bb8a2d1a2afc6a;hpb=be76f6319dcb41477209676e6f26e0030e4659ba;p=sbcl.git diff --git a/src/runtime/thread.c b/src/runtime/thread.c index 40d3afe..e2f8ab1 100644 --- a/src/runtime/thread.c +++ b/src/runtime/thread.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #ifndef CLONE_PARENT /* lameass glibc 2.2 doesn't define this */ #define CLONE_PARENT 0x00008000 /* even though the manpage documents it */ @@ -41,6 +42,7 @@ int new_thread_trampoline(struct thread *th) { lispobj function; + lispobj *args = NULL; function = th->unbound_marker; if(go==0) { fprintf(stderr, "/pausing 0x%lx(%d,%d) before new_thread_trampoline(0x%lx)\n", @@ -49,12 +51,21 @@ new_thread_trampoline(struct thread *th) fprintf(stderr, "/continue\n"); } th->unbound_marker = UNBOUND_MARKER_WIDETAG; +#ifdef LISP_FEATURE_SB_THREAD /* wait here until our thread is linked into all_threads: see below */ while(th->pid<1) sched_yield(); +#else + if(th->pid < 1) + lose("th->pid not set up right"); +#endif if(arch_os_thread_init(th)==0) return 1; /* failure. no, really */ +#if !defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_X86) + return call_into_lisp_first_time(function,args,0); +#else return funcall0(function); +#endif } /* this is called from any other thread to create the new one, and @@ -90,6 +101,7 @@ pid_t create_thread(lispobj initial_function) { memcpy(per_thread,arch_os_get_current_thread(), dynamic_values_bytes); } else { +#ifdef LISP_FEATURE_SB_THREAD int i; for(i=0;i<(dynamic_values_bytes/sizeof(lispobj));i++) per_thread->dynamic_values[i]=UNBOUND_MARKER_WIDETAG; @@ -106,15 +118,20 @@ pid_t create_thread(lispobj initial_function) { STATIC_TLS_INIT(BINDING_STACK_START,binding_stack_start); STATIC_TLS_INIT(BINDING_STACK_POINTER,binding_stack_pointer); STATIC_TLS_INIT(CONTROL_STACK_START,control_stack_start); + STATIC_TLS_INIT(CONTROL_STACK_END,control_stack_end); STATIC_TLS_INIT(ALIEN_STACK,alien_stack_pointer); +#ifdef LISP_FEATURE_X86 STATIC_TLS_INIT(PSEUDO_ATOMIC_ATOMIC,pseudo_atomic_atomic); STATIC_TLS_INIT(PSEUDO_ATOMIC_INTERRUPTED,pseudo_atomic_interrupted); +#endif #undef STATIC_TLS_INIT +#endif } th->control_stack_start = spaces; th->binding_stack_start= (lispobj*)((void*)th->control_stack_start+THREAD_CONTROL_STACK_SIZE); + th->control_stack_end = th->binding_stack_start; th->alien_stack_start= (lispobj*)((void*)th->binding_stack_start+BINDING_STACK_SIZE); th->binding_stack_pointer=th->binding_stack_start; @@ -126,29 +143,54 @@ pid_t create_thread(lispobj initial_function) { #else th->alien_stack_pointer=((void *)th->alien_stack_start); #endif +#ifdef LISP_FEATURE_X86 th->pseudo_atomic_interrupted=0; /* runtime.c used to set PSEUDO_ATOMIC_ATOMIC =1 globally. I'm not * sure why, but it appears to help */ th->pseudo_atomic_atomic=make_fixnum(1); +#endif +#ifdef LISP_FEATURE_GENCGC gc_set_region_empty(&th->alloc_region); - +#endif + +#ifndef LISP_FEATURE_SB_THREAD + /* the tls-points-into-struct-thread trick is only good for threaded + * sbcl, because unithread sbcl doesn't have tls. So, we copy the + * appropriate values from struct thread here, and make sure that + * we use the appropriate SymbolValue macros to access any of the + * variable quantities from the C runtime. It's not quite OAOOM, + * it just feels like it */ + SetSymbolValue(BINDING_STACK_START,th->binding_stack_start,th); + SetSymbolValue(CONTROL_STACK_START,th->control_stack_start,th); + SetSymbolValue(CONTROL_STACK_END,th->control_stack_end,th); +#ifdef LISP_FEATURE_X86 + SetSymbolValue(BINDING_STACK_POINTER,th->binding_stack_pointer,th); + SetSymbolValue(ALIEN_STACK,th->alien_stack_pointer,th); + SetSymbolValue(PSEUDO_ATOMIC_ATOMIC,th->pseudo_atomic_atomic,th); + SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED,th->pseudo_atomic_interrupted,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); bind_variable(CURRENT_UNWIND_PROTECT_BLOCK,make_fixnum(0),th); bind_variable(FREE_INTERRUPT_CONTEXT_INDEX,make_fixnum(0),th); bind_variable(INTERRUPT_PENDING, NIL,th); bind_variable(INTERRUPTS_ENABLED,T,th); - th->interrupt_data=malloc(sizeof (struct interrupt_data)); + th->interrupt_data=os_validate(0,(sizeof (struct interrupt_data))); if(all_threads) - memcpy(th->interrupt_data,arch_os_get_current_thread()->interrupt_data, + memcpy(th->interrupt_data, + arch_os_get_current_thread()->interrupt_data, sizeof (struct interrupt_data)); else memcpy(th->interrupt_data,global_interrupt_data, sizeof (struct interrupt_data)); - -#if defined(LISP_FEATURE_X86) && defined (LISP_FEATURE_LINUX) th->unbound_marker=initial_function; +#ifdef LISP_FEATURE_SB_THREAD +#if defined(LISP_FEATURE_X86) && defined (LISP_FEATURE_LINUX) kid_pid= clone(new_thread_trampoline, (((void*)th->control_stack_start)+THREAD_CONTROL_STACK_SIZE-4), @@ -159,7 +201,9 @@ pid_t create_thread(lispobj initial_function) { #else #error this stuff presently only works on x86 Linux #endif - +#else + kid_pid=getpid(); +#endif get_spinlock(&all_threads_lock,kid_pid); th->next=all_threads; all_threads=th; @@ -169,6 +213,11 @@ pid_t create_thread(lispobj initial_function) { protect_control_stack_guard_page(th->pid,1); all_threads_lock=0; th->pid=kid_pid; /* child will not start until this is set */ +#ifndef LISP_FEATURE_SB_THREAD + new_thread_trampoline(all_threads); /* call_into_lisp */ + lose("Clever child? Idiot savant, verging on the."); +#endif + return th->pid; cleanup: /* if(th && th->tls_cookie>=0) os_free_tls_pointer(th); */ @@ -182,7 +231,9 @@ void destroy_thread (struct thread *th) { /* precondition: the unix task has already been killed and exited. * This is called by the parent */ +#ifdef LISP_FEATURE_GENCGC gc_alloc_update_page_tables(0, &th->alloc_region); +#endif get_spinlock(&all_threads_lock,th->pid); if(th==all_threads) all_threads=th->next; @@ -194,8 +245,9 @@ void destroy_thread (struct thread *th) all_threads_lock=0; if(th && th->tls_cookie>=0) arch_os_thread_cleanup(th); os_invalidate((os_vm_address_t) th->control_stack_start, - THREAD_CONTROL_STACK_SIZE+BINDING_STACK_SIZE+ - ALIEN_STACK_SIZE+dynamic_values_bytes+ + ((sizeof (lispobj)) + * (th->control_stack_end-th->control_stack_start)) + + BINDING_STACK_SIZE+ALIEN_STACK_SIZE+dynamic_values_bytes+ 32*SIGSTKSZ); } @@ -208,18 +260,6 @@ struct thread *find_thread_by_pid(pid_t pid) return 0; } - -void get_spinlock(lispobj *word,int value) -{ - u32 eax=0; - do { - asm ("xor %0,%0;cmpxchg %1,%2" - : "=a" (eax) - : "r" (value), "m" (*word) - : "memory", "cc"); - } while(eax!=0); -} - void block_sigcont(void) { /* don't allow ourselves to receive SIGCONT while we're in the @@ -231,6 +271,10 @@ void block_sigcont(void) sigprocmask(SIG_BLOCK, &newset, 0); } +/* This is not needed unless #+SB-THREAD, and since sigwaitinfo() + * doesn't seem to be easily available everywhere (OpenBSD...) it's + * more trouble than it's worth to compile it when not needed. */ +#if defined LISP_FEATURE_SB_THREAD void unblock_sigcont_and_sleep(void) { sigset_t set; @@ -239,4 +283,4 @@ void unblock_sigcont_and_sleep(void) sigwaitinfo(&set,0); sigprocmask(SIG_UNBLOCK,&set,0); } - +#endif