From: Nicholas Clark <nick@ccl4.org>
Date: Wed, 16 Nov 2005 20:18:58 +0000 (+0000)
Subject: PL_pte_root and PL_pte_arenaroot can be exterminated. Which reveals
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7994ab570190ecbe2fce4549592cfcd8bb620e43;p=p5sagit%2Fp5-mst-13.2.git

PL_pte_root and PL_pte_arenaroot can be exterminated. Which reveals
an erroneous remaining reference to PL_pte_root to correct.

p4raw-id: //depot/perl@26142
---

diff --git a/embedvar.h b/embedvar.h
index 038039a..bdd9518 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -360,8 +360,6 @@
 #define PL_psig_name		(vTHX->Ipsig_name)
 #define PL_psig_pend		(vTHX->Ipsig_pend)
 #define PL_psig_ptr		(vTHX->Ipsig_ptr)
-#define PL_pte_arenaroot	(vTHX->Ipte_arenaroot)
-#define PL_pte_root		(vTHX->Ipte_root)
 #define PL_ptr_table		(vTHX->Iptr_table)
 #define PL_reentrant_buffer	(vTHX->Ireentrant_buffer)
 #define PL_reentrant_retint	(vTHX->Ireentrant_retint)
@@ -643,8 +641,6 @@
 #define PL_Ipsig_name		PL_psig_name
 #define PL_Ipsig_pend		PL_psig_pend
 #define PL_Ipsig_ptr		PL_psig_ptr
-#define PL_Ipte_arenaroot	PL_pte_arenaroot
-#define PL_Ipte_root		PL_pte_root
 #define PL_Iptr_table		PL_ptr_table
 #define PL_Ireentrant_buffer	PL_reentrant_buffer
 #define PL_Ireentrant_retint	PL_reentrant_retint
diff --git a/intrpvar.h b/intrpvar.h
index 1612b9f..7c14985 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -251,9 +251,6 @@ PERLVARA(Ibody_roots,	SVt_LAST, void*) /* array of body roots */
 
 PERLVAR(Ihe_root,	HE *)		/* free he list */
 
-#if defined(USE_ITHREADS)
-PERLVAR(Ipte_root,	struct ptr_tbl_ent *)	/* free ptr_tbl_ent list */
-#endif
 PERLVAR(Inice_chunk,	char *)		/* a nice chunk of memory to reuse */
 PERLVAR(Inice_chunk_size,	U32)	/* how nice the chunk of memory is */
 
@@ -421,10 +418,6 @@ PERLVARI(Ibeginav_save, AV*, Nullav)	/* save BEGIN{}s when compiling */
 PERLVARA(Ibody_arenaroots, SVt_LAST, void*) /* consolidated body-arena pointers */
 
 PERLVAR(Ihe_arenaroot,	HE *)		/* list of allocated he areas */
-#if defined(USE_ITHREADS)
-PERLVAR(Ipte_arenaroot,	struct ptr_tbl_ent *) /* list of allocated pte areas */
-
-#endif
 
      /* 5.6.0 stopped here */
 
diff --git a/perlapi.h b/perlapi.h
index cb9fac4..d5ebdd7 100644
--- a/perlapi.h
+++ b/perlapi.h
@@ -518,10 +518,6 @@ END_EXTERN_C
 #define PL_psig_pend		(*Perl_Ipsig_pend_ptr(aTHX))
 #undef  PL_psig_ptr
 #define PL_psig_ptr		(*Perl_Ipsig_ptr_ptr(aTHX))
-#undef  PL_pte_arenaroot
-#define PL_pte_arenaroot	(*Perl_Ipte_arenaroot_ptr(aTHX))
-#undef  PL_pte_root
-#define PL_pte_root		(*Perl_Ipte_root_ptr(aTHX))
 #undef  PL_ptr_table
 #define PL_ptr_table		(*Perl_Iptr_table_ptr(aTHX))
 #undef  PL_reentrant_buffer
diff --git a/sv.c b/sv.c
index 1f28bbb..da75a98 100644
--- a/sv.c
+++ b/sv.c
@@ -597,9 +597,6 @@ Perl_sv_free_arenas(pTHX)
     }
 
     free_arena(he);
-#if defined(USE_ITHREADS)
-    free_arena(pte);
-#endif
 
     Safefree(PL_nice_chunk);
     PL_nice_chunk = Nullch;
@@ -9867,7 +9864,7 @@ Perl_ptr_table_store(pTHX_ PTR_TBL_t *tbl, const void *oldsv, void *newsv)
 	    return;
 	}
     }
-    new_body_inline(tblent, (void**)&PL_pte_root,
+    new_body_inline(tblent, &PL_body_roots[PTE_SVSLOT],
 		    sizeof(struct ptr_tbl_ent), PTE_SVSLOT);
     tblent->oldval = oldsv;
     tblent->newval = newsv;
@@ -10968,10 +10965,6 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags,
     PL_he_arenaroot	= NULL;
     PL_he_root		= NULL;
 
-#if defined(USE_ITHREADS)
-    PL_pte_arenaroot	= NULL;
-    PL_pte_root		= NULL;
-#endif
     PL_nice_chunk	= NULL;
     PL_nice_chunk_size	= 0;
     PL_sv_count		= 0;