X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=thread.h;h=9b7524586c6517a5f3e527e5115e2aa81b2d363d;hb=5f8e730b530d1a9f84c2333a1f2ca080d2fb3303;hp=79064e494e6648992fcfe339a7726698e5b20f75;hpb=38a03e6ea6b9b346c41b9006fbeedc3b0f0130b2;p=p5sagit%2Fp5-mst-13.2.git diff --git a/thread.h b/thread.h index 79064e4..9b75245 100644 --- a/thread.h +++ b/thread.h @@ -1,11 +1,11 @@ #ifdef USE_THREADS #ifdef WIN32 -# include "win32/win32thread.h" -#endif +# include +#else +#ifndef DJGPP /* POSIXish threads */ -typedef pthread_t perl_thread; #ifdef OLD_PTHREADS_API # define pthread_mutexattr_init(a) pthread_mutexattr_create(a) # define pthread_mutexattr_settype(a,t) pthread_mutexattr_setkind_np(a,t) @@ -21,11 +21,28 @@ typedef pthread_t perl_thread; #else # define pthread_mutexattr_default NULL # define pthread_condattr_default NULL -# define pthread_attr_default NULL #endif /* OLD_PTHREADS_API */ +#endif +#endif + +#ifdef PTHREADS_CREATED_JOINABLE +# define ATTR_JOINABLE PTHREAD_CREATE_JOINABLE +#else +# ifdef PTHREAD_CREATE_UNDETACHED +# define ATTR_JOINABLE PTHREAD_CREATE_UNDETACHED +# else +# define ATTR_JOINABLE PTHREAD_CREATE_JOINABLE +# endif +#endif #ifndef YIELD -# define YIELD sched_yield() +# ifdef HAS_SCHED_YIELD +# define YIELD sched_yield() +# else +# ifdef HAS_PTHREAD_YIELD +# define YIELD pthread_yield() +# endif +# endif #endif #ifndef MUTEX_INIT @@ -108,15 +125,23 @@ typedef pthread_t perl_thread; #ifndef THR # ifdef OLD_PTHREADS_API -struct thread *getTHR _((void)); +struct perl_thread *getTHR _((void)); # define THR getTHR() # else -# define THR ((struct thread *) pthread_getspecific(thr_key)) +# define THR ((struct perl_thread *) pthread_getspecific(thr_key)) # endif /* OLD_PTHREADS_API */ #endif /* THR */ +/* + * dTHR is performance-critical. Here, we only do the pthread_get_specific + * if there may be more than one thread in existence, otherwise we get thr + * from thrsv which is cached in the per-interpreter structure. + * Systems with very fast pthread_get_specific (which should be all systems + * but unfortunately isn't) may wish to simplify to "...*thr = THR". + */ #ifndef dTHR -# define dTHR struct thread *thr = THR +# define dTHR \ + struct perl_thread *thr = threadnum? THR : (struct perl_thread*)SvPVX(thrsv) #endif /* dTHR */ #ifndef INIT_THREADS @@ -127,111 +152,32 @@ struct thread *getTHR _((void)); # endif #endif +/* Accessor for per-thread SVs */ +#define THREADSV(i) (thr->threadsvp[i]) + +/* + * LOCK_SV_MUTEX and UNLOCK_SV_MUTEX are performance-critical. Here, we + * try only locking them if there may be more than one thread in existence. + * Systems with very fast mutexes (and/or slow conditionals) may wish to + * remove the "if (threadnum) ..." test. + */ +#define LOCK_SV_MUTEX \ + STMT_START { \ + if (threadnum) \ + MUTEX_LOCK(&sv_mutex); \ + } STMT_END + +#define UNLOCK_SV_MUTEX \ + STMT_START { \ + if (threadnum) \ + MUTEX_UNLOCK(&sv_mutex); \ + } STMT_END + #ifndef THREAD_RET_TYPE # define THREAD_RET_TYPE void * # define THREAD_RET_CAST(p) ((void *)(p)) #endif /* THREAD_RET */ -struct thread { - /* The fields that used to be global */ - /* Important ones in the first cache line (if alignment is done right) */ - SV ** Tstack_sp; -#ifdef OP_IN_REGISTER - OP * Topsave; -#else - OP * Top; -#endif - SV ** Tcurpad; - SV ** Tstack_base; - - SV ** Tstack_max; - - I32 * Tscopestack; - I32 Tscopestack_ix; - I32 Tscopestack_max; - - ANY * Tsavestack; - I32 Tsavestack_ix; - I32 Tsavestack_max; - - OP ** Tretstack; - I32 Tretstack_ix; - I32 Tretstack_max; - - I32 * Tmarkstack; - I32 * Tmarkstack_ptr; - I32 * Tmarkstack_max; - - SV * TSv; - XPV * TXpv; - struct stat Tstatbuf; - struct tms Ttimesbuf; - - /* XXX What about regexp stuff? */ - - /* Now the fields that used to be "per interpreter" (even when global) */ - - /* Fields used by magic variables such as $@, $/ and so on */ - bool Ttainted; - PMOP * Tcurpm; - SV * Tnrs; - SV * Trs; - GV * Tlast_in_gv; - char * Tofs; - STRLEN Tofslen; - GV * Tdefoutgv; - char * Tchopset; - SV * Tformtarget; - SV * Tbodytarget; - SV * Ttoptarget; - - /* Stashes */ - HV * Tdefstash; - HV * Tcurstash; - - /* Stacks */ - SV ** Ttmps_stack; - I32 Ttmps_ix; - I32 Ttmps_floor; - I32 Ttmps_max; - - int Tin_eval; - OP * Trestartop; - int Tdelaymagic; - bool Tdirty; - U8 Tlocalizing; - COP * Tcurcop; - - CONTEXT * Tcxstack; - I32 Tcxstack_ix; - I32 Tcxstack_max; - - AV * Tcurstack; - AV * Tmainstack; - JMPENV * Ttop_env; - I32 Trunlevel; - - /* XXX Sort stuff, firstgv, secongv and so on? */ - - SV * oursv; - HV * cvcache; - perl_thread self; /* Underlying thread object */ - U32 flags; - AV * magicals; /* Per-thread magicals */ - AV * specific; /* Thread-specific user data */ - SV * errsv; /* Backing SV for $@ */ - HV * errhv; /* HV for what was %@ in pp_ctl.c */ - perl_mutex mutex; /* For the fields others can change */ - U32 tid; - struct thread *next, *prev; /* Circular linked list of threads */ - -#ifdef ADD_THREAD_INTERN - struct thread_intern i; /* Platform-dependent internals */ -#endif - char trailing_nul; /* For the sake of thrsv and oursv */ -}; - -typedef struct thread *Thread; /* Values and macros for thr->flags */ #define THRf_STATE_MASK 7 @@ -241,10 +187,10 @@ typedef struct thread *Thread; #define THRf_ZOMBIE 3 #define THRf_DEAD 4 -#define THRf_DIE_FATAL 8 +#define THRf_DID_DIE 8 /* ThrSTATE(t) and ThrSETSTATE(t) must only be called while holding t->mutex */ -#define ThrSTATE(t) ((t)->flags) +#define ThrSTATE(t) ((t)->flags & THRf_STATE_MASK) #define ThrSETSTATE(t, s) STMT_START { \ (t)->flags &= ~THRf_STATE_MASK; \ (t)->flags |= (s); \ @@ -264,125 +210,6 @@ typedef struct condpair { #define MgCONDP(mg) (&((condpair_t *)(mg->mg_ptr))->cond) #define MgOWNER(mg) ((condpair_t *)(mg->mg_ptr))->owner -#undef stack_base -#undef stack_sp -#undef stack_max -#undef curstack -#undef mainstack -#undef markstack -#undef markstack_ptr -#undef markstack_max -#undef scopestack -#undef scopestack_ix -#undef scopestack_max -#undef savestack -#undef savestack_ix -#undef savestack_max -#undef retstack -#undef retstack_ix -#undef retstack_max -#undef curcop -#undef cxstack -#undef cxstack_ix -#undef cxstack_max -#undef defstash -#undef curstash -#undef tmps_stack -#undef tmps_floor -#undef tmps_ix -#undef tmps_max -#undef curpad -#undef Sv -#undef Xpv -#undef statbuf -#undef timesbuf -#undef tainted -#undef curpm -#undef nrs -#undef rs -#undef last_in_gv -#undef ofs -#undef ofslen -#undef defoutgv -#undef chopset -#undef formtarget -#undef bodytarget -#undef toptarget -#undef top_env -#undef runlevel -#undef in_eval -#undef restartop -#undef delaymagic -#undef dirty -#undef localizing - -#define stack_base (thr->Tstack_base) -#define stack_sp (thr->Tstack_sp) -#define stack_max (thr->Tstack_max) -#ifdef OP_IN_REGISTER -#define opsave (thr->Topsave) -#else -#undef op -#define op (thr->Top) -#endif -#define curcop (thr->Tcurcop) -#define stack (thr->Tstack) -#define curstack (thr->Tcurstack) -#define mainstack (thr->Tmainstack) -#define markstack (thr->Tmarkstack) -#define markstack_ptr (thr->Tmarkstack_ptr) -#define markstack_max (thr->Tmarkstack_max) -#define scopestack (thr->Tscopestack) -#define scopestack_ix (thr->Tscopestack_ix) -#define scopestack_max (thr->Tscopestack_max) - -#define savestack (thr->Tsavestack) -#define savestack_ix (thr->Tsavestack_ix) -#define savestack_max (thr->Tsavestack_max) - -#define retstack (thr->Tretstack) -#define retstack_ix (thr->Tretstack_ix) -#define retstack_max (thr->Tretstack_max) - -#define cxstack (thr->Tcxstack) -#define cxstack_ix (thr->Tcxstack_ix) -#define cxstack_max (thr->Tcxstack_max) - -#define curpad (thr->Tcurpad) -#define Sv (thr->TSv) -#define Xpv (thr->TXpv) -#define statbuf (thr->Tstatbuf) -#define timesbuf (thr->Ttimesbuf) -#define tainted (thr->Ttainted) -#define tainted (thr->Ttainted) -#define curpm (thr->Tcurpm) -#define nrs (thr->Tnrs) -#define rs (thr->Trs) -#define last_in_gv (thr->Tlast_in_gv) -#define ofs (thr->Tofs) -#define ofslen (thr->Tofslen) -#define defoutgv (thr->Tdefoutgv) -#define chopset (thr->Tchopset) -#define formtarget (thr->Tformtarget) -#define bodytarget (thr->Tbodytarget) -#define toptarget (thr->Ttoptarget) -#define defstash (thr->Tdefstash) -#define curstash (thr->Tcurstash) - -#define tmps_stack (thr->Ttmps_stack) -#define tmps_ix (thr->Ttmps_ix) -#define tmps_floor (thr->Ttmps_floor) -#define tmps_max (thr->Ttmps_max) - -#define in_eval (thr->Tin_eval) -#define restartop (thr->Trestartop) -#define delaymagic (thr->Tdelaymagic) -#define dirty (thr->Tdirty) -#define localizing (thr->Tlocalizing) - -#define top_env (thr->Ttop_env) -#define runlevel (thr->Trunlevel) - #else /* USE_THREADS is not defined */ #define MUTEX_LOCK(m) @@ -394,8 +221,14 @@ typedef struct condpair { #define COND_BROADCAST(c) #define COND_WAIT(c, m) #define COND_DESTROY(c) +#define LOCK_SV_MUTEX +#define UNLOCK_SV_MUTEX #define THR /* Rats: if dTHR is just blank then the subsequent ";" throws an error */ +#ifdef WIN32 +#define dTHR extern int Perl___notused +#else #define dTHR extern int errno +#endif #endif /* USE_THREADS */