X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=thrdvar.h;h=a4f3d3595f718cdd237c38da5f7e66c446f2bdd1;hb=62703e7218aceb3f5d30f70a2307dd02e5eb8c63;hp=8e999fc62ee667b04800e26fe838b5fa3d5a14b9;hpb=a2efc82216efc10377cf26fd4aff1aa5e66c6687;p=p5sagit%2Fp5-mst-13.2.git diff --git a/thrdvar.h b/thrdvar.h index 8e999fc..a4f3d35 100644 --- a/thrdvar.h +++ b/thrdvar.h @@ -1,3 +1,16 @@ +/* thdrvar.h + * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by Larry Wall and others + * + * You may distribute under the terms of either the GNU General Public + * License or the Artistic License, as specified in the README file. + * + */ + +/* +=head1 Global Variables +*/ + /***********************************************/ /* Global only to current thread */ /***********************************************/ @@ -5,19 +18,15 @@ /* Don't forget to re-run embed.pl to propagate changes! */ /* The 'T' prefix is only needed for vars that need appropriate #defines - * generated when built with or without USE_THREADS. It is also used + * generated when built with or without USE_5005THREADS. It is also used * to generate the appropriate export list for win32. * - * When building without USE_THREADS, these variables will be truly global. - * When building without USE_THREADS but with MULTIPLICITY, these variables + * When building without USE_5005THREADS, these variables will be truly global. + * When building without USE_5005THREADS but with MULTIPLICITY, these variables * will be global per-interpreter. */ /* Important ones in the first cache line (if alignment is done right) */ -#ifdef USE_THREADS -PERLVAR(interp, PerlInterpreter*) /* thread owner */ -#endif - PERLVAR(Tstack_sp, SV **) /* top of the stack */ #ifdef OP_IN_REGISTER PERLVAR(Topsave, OP *) @@ -47,10 +56,6 @@ PERLVAR(Tmarkstack, I32 *) /* stack_sp locations we're remembering */ PERLVAR(Tmarkstack_ptr, I32 *) PERLVAR(Tmarkstack_max, I32 *) -PERLVAR(Tretstack, OP **) /* OPs we have postponed executing */ -PERLVAR(Tretstack_ix, I32) -PERLVAR(Tretstack_max, I32) - PERLVAR(TSv, SV *) /* used to hold temporary values */ PERLVAR(TXpv, XPV *) /* used to hold temporary values */ @@ -81,7 +86,7 @@ PERLVAR(Ttimesbuf, struct tms) /* Fields used by magic variables such as $@, $/ and so on */ PERLVAR(Ttainted, bool) /* using variables controlled by $< */ PERLVAR(Tcurpm, PMOP *) /* what to do \ interps in REs from */ -PERLVAR(Tnrs, SV *) +PERLVAR(Tnrs, SV *) /* was placeholder: unused since 5.8.0 (5.7.2 patch #12027 for bug ID 20010815.012). Used to save rx->saved_copy */ /* =for apidoc mn|SV*|PL_rs @@ -103,7 +108,7 @@ PERLVAR(Trs, SV *) /* input record separator $/ */ PERLVAR(Tlast_in_gv, GV *) /* GV used in last */ PERLVAR(Tofs_sv, SV *) /* output field separator $, */ PERLVAR(Tdefoutgv, GV *) /* default FH for output */ -PERLVARI(Tchopset, char *, " \n-") /* $: */ +PERLVARI(Tchopset, const char *, " \n-") /* $: */ PERLVAR(Tformtarget, SV *) PERLVAR(Tbodytarget, SV *) PERLVAR(Ttoptarget, SV *) @@ -125,15 +130,12 @@ PERLVAR(Tmainstack, AV *) /* the stack when nothing funny is happening */ PERLVAR(Ttop_env, JMPENV *) /* ptr. to current sigjmp() environment */ PERLVAR(Tstart_env, JMPENV) /* empty startup sigjmp() environment */ -#ifdef PERL_FLEXIBLE_EXCEPTIONS -PERLVARI(Tprotect, protect_proc_t, MEMBER_TO_FPTR(Perl_default_protect)) -#endif PERLVARI(Terrors, SV *, Nullsv) /* outstanding queued errors */ /* statics "owned" by various functions */ -PERLVAR(Tav_fetch_sv, SV *) /* owned by av_fetch() */ -PERLVAR(Thv_fetch_sv, SV *) /* owned by hv_fetch() */ -PERLVAR(Thv_fetch_ent_mh, HE) /* owned by hv_fetch_ent() */ +PERLVAR(Tav_fetch_sv, SV *) /* unused as of change #19268 */ +PERLVAR(Thv_fetch_sv, SV *) /* unused as of change #19268 */ +PERLVAR(Thv_fetch_ent_mh, HE*) /* owned by hv_fetch_ent() */ PERLVAR(Tmodcount, I32) /* how much mod()ification in assignment? */ @@ -159,23 +161,11 @@ PERLVARI(Tmaxscream, I32, -1) PERLVAR(Tlastscream, SV *) PERLVAR(Tregdummy, regnode) /* from regcomp.c */ -PERLVAR(Tregcomp_parse, char*) /* Input-scan pointer. */ -PERLVAR(Tregxend, char*) /* End of input for compile */ -PERLVAR(Tregcode, regnode*) /* Code-emit pointer; ®dummy = don't */ -PERLVAR(Tregnaughty, I32) /* How bad is this pattern? */ -PERLVAR(Tregsawback, I32) /* Did we see \1, ...? */ PERLVAR(Tregprecomp, char *) /* uncompiled string. */ PERLVAR(Tregnpar, I32) /* () count. */ PERLVAR(Tregsize, I32) /* Code size. */ -PERLVAR(Tregflags, U16) /* are we folding, multilining? */ -PERLVAR(Tregseen, U32) /* from regcomp.c */ -PERLVAR(Tseen_zerolen, I32) /* from regcomp.c */ -PERLVAR(Tseen_evals, I32) /* from regcomp.c */ -PERLVAR(Tregcomp_rx, regexp *) /* from regcomp.c */ -PERLVAR(Textralen, I32) /* from regcomp.c */ PERLVAR(Tcolorset, int) /* from regcomp.c */ PERLVARA(Tcolors,6, char *) /* from regcomp.c */ -PERLVAR(Treg_whilem_seen, I32) /* number of WHILEM in this expr */ PERLVAR(Treginput, char *) /* String-input pointer. */ PERLVAR(Tregbol, char *) /* Beginning of input, for ^ check. */ PERLVAR(Tregeol, char *) /* End of input, for $ check. */ @@ -184,7 +174,6 @@ PERLVAR(Tregendp, I32 *) /* Ditto for endp. */ PERLVAR(Treglastparen, U32 *) /* Similarly for lastparen. */ PERLVAR(Treglastcloseparen, U32 *) /* Similarly for lastcloseparen. */ PERLVAR(Tregtill, char *) /* How far we are required to go. */ -PERLVAR(Tregcompat1, char) /* used to be regprev1 */ PERLVAR(Treg_start_tmp, char **) /* from regexec.c */ PERLVAR(Treg_start_tmpl,U32) /* from regexec.c */ PERLVAR(Tregdata, struct reg_data *) @@ -233,27 +222,5 @@ PERLVAR(Twatchok, char *) /* Note that the variables below are all explicitly referenced in the code * as thr->whatever and therefore don't need the 'T' prefix. */ -#ifdef USE_THREADS - -PERLVAR(oursv, SV *) -PERLVAR(cvcache, HV *) -PERLVAR(self, perl_os_thread) /* Underlying thread object */ -PERLVAR(flags, U32) -PERLVAR(threadsv, AV *) /* Per-thread SVs ($_, $@ etc.) */ -PERLVAR(threadsvp, SV **) /* AvARRAY(threadsv) */ -PERLVAR(specific, AV *) /* Thread-specific user data */ -PERLVAR(errsv, SV *) /* Backing SV for $@ */ -PERLVAR(mutex, perl_mutex) /* For the fields others can change */ -PERLVAR(tid, U32) -PERLVAR(prev, struct perl_thread *) -PERLVAR(next, struct perl_thread *) - /* Circular linked list of threads */ - -#ifdef HAVE_THREAD_INTERN -PERLVAR(i, struct thread_intern) - /* Platform-dependent internals */ -#endif +PERLVAR(Treg_match_utf8, bool) /* was what we matched against utf8 */ -PERLVAR(trailing_nul, char) /* For the sake of thrsv and oursv */ -PERLVAR(thr_done, bool) /* True when the thread has finished */ -#endif /* USE_THREADS */