Integrate the perlfork half of #9513 from maintperl into mainline

[perl5.git] / thrdvar.h

diff --git a/thrdvar.h b/thrdvar.h
index f4d3ed4..d35c1d9 100644 (file)
--- a/thrdvar.h
+++ b/thrdvar.h
@@ -10,10 +10,7 @@
  *
  * When building without USE_THREADS, these variables will be truly global.
  * When building without USE_THREADS but with MULTIPLICITY, these variables
- * will be global per-interpreter.
- *
- * Avoid build-specific #ifdefs here, like DEBUGGING.  That way,
- * we can keep binary compatibility of the curinterp structure */
+ * will be global per-interpreter. */
 
 /* Important ones in the first cache line (if alignment is done right) */
 
@@ -56,6 +53,18 @@ PERLVAR(Tretstack_max,       I32)
 
 PERLVAR(TSv,           SV *)           /* used to hold temporary values */
 PERLVAR(TXpv,          XPV *)          /* used to hold temporary values */
+
+/*
+=for apidoc Amn|STRLEN|PL_na
+
+A convenience variable which is typically used with C<SvPV> when one
+doesn't care about the length of the string.  It is usually more efficient
+to either declare a local variable and use that instead or to use the
+C<SvPV_nolen> macro.
+
+=cut
+*/
+
 PERLVAR(Tna,           STRLEN)         /* for use in SvPV when length is
                                           Not Applicable */
 
@@ -73,10 +82,26 @@ PERLVAR(Ttimesbuf,  struct tms)
 PERLVAR(Ttainted,      bool)           /* using variables controlled by $< */
 PERLVAR(Tcurpm,                PMOP *)         /* what to do \ interps in REs from */
 PERLVAR(Tnrs,          SV *)
+
+/*
+=for apidoc mn|SV*|PL_rs
+
+The input record separator - C<$/> in Perl space.
+
+=for apidoc mn|GV*|PL_last_in_gv
+
+The GV which was last used for a filehandle input operation. (C<< <FH> >>)
+
+=for apidoc mn|SV*|PL_ofs_sv
+
+The output field separator - C<$,> in Perl space.
+
+=cut
+*/
+
 PERLVAR(Trs,           SV *)           /* input record separator $/ */
 PERLVAR(Tlast_in_gv,   GV *)           /* GV used in last <FH> */
-PERLVAR(Tofs,          char *)         /* output field separator $, */
-PERLVAR(Tofslen,       STRLEN)
+PERLVAR(Tofs_sv,       SV *)           /* output field separator $, */
 PERLVAR(Tdefoutgv,     GV *)           /* default FH for output */
 PERLVARI(Tchopset,     char *, " \n-") /* $: */
 PERLVAR(Tformtarget,   SV *)
@@ -100,7 +125,10 @@ 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() */
@@ -119,6 +147,10 @@ PERLVAR(Tfirstgv,  GV *)           /* $a */
 PERLVAR(Tsecondgv,     GV *)           /* $b */
 PERLVAR(Tsortcxix,     I32)            /* from pp_ctl.c */
 
+/* float buffer */
+PERLVAR(Tefloatbuf,    char*)
+PERLVAR(Tefloatsize,   STRLEN)
+
 /* regex stuff */
 
 PERLVAR(Tscreamfirst,  I32 *)
@@ -143,6 +175,7 @@ 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. */
@@ -172,6 +205,10 @@ PERLVARI(Treg_oldcurpm,    PMOP*, NULL)    /* curpm before match */
 PERLVARI(Treg_curpm,   PMOP*, NULL)    /* curpm during match */
 PERLVAR(Treg_oldsaved, char*)          /* old saved substr during match */
 PERLVAR(Treg_oldsavedlen, STRLEN)      /* old length of saved substr during match */
+PERLVAR(Treg_maxiter,  I32)            /* max wait until caching pos */
+PERLVAR(Treg_leftiter, I32)            /* wait until caching pos */
+PERLVARI(Treg_poscache, char *, Nullch)        /* cache of pos of WHILEM */
+PERLVAR(Treg_poscache_size, STRLEN)    /* size of pos cache of WHILEM */
 
 PERLVARI(Tregcompp,    regcomp_t, MEMBER_TO_FPTR(Perl_pregcomp))
                                        /* Pointer to REx compiler */
@@ -187,10 +224,8 @@ PERLVARI(Tregfree, regfree_t, MEMBER_TO_FPTR(Perl_pregfree))
 PERLVARI(Treginterp_cnt,int,       0)  /* Whether `Regexp'
                                                   was interpolated. */
 PERLVARI(Treg_starttry,        char *,     0)  /* -Dr: where regtry was called. */
-#ifdef DEBUGGING
 PERLVARI(Twatchaddr,   char **,    0)
 PERLVAR(Twatchok,      char *)
-#endif
 
 /* Note that the variables below are all explicitly referenced in the code
  * as thr->whatever and therefore don't need the 'T' prefix. */
@@ -205,7 +240,6 @@ 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(errhv,         HV *)           /* HV for what was %@ in pp_ctl.c */
 PERLVAR(mutex,         perl_mutex)     /* For the fields others can change */
 PERLVAR(tid,           U32)
 PERLVAR(prev,          struct perl_thread *)
@@ -218,5 +252,5 @@ PERLVAR(i,          struct thread_intern)
 #endif
 
 PERLVAR(trailing_nul,  char)           /* For the sake of thrsv and oursv */
-
+PERLVAR(thr_done,      bool)           /* True when the thread has finished */
 #endif /* USE_THREADS */