summaryrefslogtreecommitdiff
path: root/embedvar.h
diff options
context:
space:
mode:
authorKarl Williamson <khw@cpan.org>2018-03-13 21:52:15 -0600
committerKarl Williamson <khw@cpan.org>2018-03-14 09:35:35 -0600
commit744ebf52f3e4ca5e41d9ce8bc68e10cae14592a0 (patch)
tree2a41d4ff70b04876f40f0e5b442f470465b5c476 /embedvar.h
parent32a62865ef662fce2b2250a7e0eca15861e7fe20 (diff)
downloadperl-744ebf52f3e4ca5e41d9ce8bc68e10cae14592a0.tar.gz
Make Unicode data structures global
These structures are read-only, use const C strings, and are truly global, so no need to have them be interpreter level. This saves duplicating and freeing them as threads come and go. In doing this, I noticed that not every one was properly being copied/deallocated, so this fixes some potential unreported bugs, and leaks.
Diffstat (limited to 'embedvar.h')
-rw-r--r--embedvar.h57
1 files changed, 38 insertions, 19 deletions
diff --git a/embedvar.h b/embedvar.h
index 73c20e7f1b..a3f7fb3dd3 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -40,8 +40,6 @@
# define vTHX PERL_GET_INTERP
# endif
-#define PL_AboveLatin1 (vTHX->IAboveLatin1)
-#define PL_Assigned_invlist (vTHX->IAssigned_invlist)
#define PL_DBcontrol (vTHX->IDBcontrol)
#define PL_DBcv (vTHX->IDBcv)
#define PL_DBgv (vTHX->IDBgv)
@@ -52,25 +50,15 @@
#define PL_DBtrace (vTHX->IDBtrace)
#define PL_Dir (vTHX->IDir)
#define PL_Env (vTHX->IEnv)
-#define PL_GCB_invlist (vTHX->IGCB_invlist)
-#define PL_HasMultiCharFold (vTHX->IHasMultiCharFold)
#define PL_InBitmap (vTHX->IInBitmap)
-#define PL_LB_invlist (vTHX->ILB_invlist)
#define PL_LIO (vTHX->ILIO)
-#define PL_Latin1 (vTHX->ILatin1)
#define PL_Mem (vTHX->IMem)
#define PL_MemParse (vTHX->IMemParse)
#define PL_MemShared (vTHX->IMemShared)
-#define PL_NonL1NonFinalFold (vTHX->INonL1NonFinalFold)
#define PL_Proc (vTHX->IProc)
-#define PL_SB_invlist (vTHX->ISB_invlist)
-#define PL_SCX_invlist (vTHX->ISCX_invlist)
#define PL_Sock (vTHX->ISock)
#define PL_StdIO (vTHX->IStdIO)
#define PL_Sv (vTHX->ISv)
-#define PL_UpperLatin1 (vTHX->IUpperLatin1)
-#define PL_WB_invlist (vTHX->IWB_invlist)
-#define PL_XPosix_ptrs (vTHX->IXPosix_ptrs)
#define PL_Xpv (vTHX->IXpv)
#define PL_an (vTHX->Ian)
#define PL_argvgv (vTHX->Iargvgv)
@@ -350,20 +338,13 @@
#define PL_unsafe (vTHX->Iunsafe)
#define PL_utf8_charname_begin (vTHX->Iutf8_charname_begin)
#define PL_utf8_charname_continue (vTHX->Iutf8_charname_continue)
-#define PL_utf8_foldable (vTHX->Iutf8_foldable)
#define PL_utf8_foldclosures (vTHX->Iutf8_foldclosures)
-#define PL_utf8_idcont (vTHX->Iutf8_idcont)
-#define PL_utf8_idstart (vTHX->Iutf8_idstart)
#define PL_utf8_mark (vTHX->Iutf8_mark)
-#define PL_utf8_perl_idcont (vTHX->Iutf8_perl_idcont)
-#define PL_utf8_perl_idstart (vTHX->Iutf8_perl_idstart)
#define PL_utf8_swash_ptrs (vTHX->Iutf8_swash_ptrs)
#define PL_utf8_tofold (vTHX->Iutf8_tofold)
#define PL_utf8_tolower (vTHX->Iutf8_tolower)
#define PL_utf8_totitle (vTHX->Iutf8_totitle)
#define PL_utf8_toupper (vTHX->Iutf8_toupper)
-#define PL_utf8_xidcont (vTHX->Iutf8_xidcont)
-#define PL_utf8_xidstart (vTHX->Iutf8_xidstart)
#define PL_utf8cache (vTHX->Iutf8cache)
#define PL_utf8locale (vTHX->Iutf8locale)
#define PL_warn_locale (vTHX->Iwarn_locale)
@@ -376,8 +357,32 @@
#if defined(PERL_GLOBAL_STRUCT)
+#define PL_AboveLatin1 (my_vars->GAboveLatin1)
+#define PL_GAboveLatin1 (my_vars->GAboveLatin1)
+#define PL_Assigned_invlist (my_vars->GAssigned_invlist)
+#define PL_GAssigned_invlist (my_vars->GAssigned_invlist)
#define PL_C_locale_obj (my_vars->GC_locale_obj)
#define PL_GC_locale_obj (my_vars->GC_locale_obj)
+#define PL_GCB_invlist (my_vars->GGCB_invlist)
+#define PL_GGCB_invlist (my_vars->GGCB_invlist)
+#define PL_HasMultiCharFold (my_vars->GHasMultiCharFold)
+#define PL_GHasMultiCharFold (my_vars->GHasMultiCharFold)
+#define PL_LB_invlist (my_vars->GLB_invlist)
+#define PL_GLB_invlist (my_vars->GLB_invlist)
+#define PL_Latin1 (my_vars->GLatin1)
+#define PL_GLatin1 (my_vars->GLatin1)
+#define PL_NonL1NonFinalFold (my_vars->GNonL1NonFinalFold)
+#define PL_GNonL1NonFinalFold (my_vars->GNonL1NonFinalFold)
+#define PL_SB_invlist (my_vars->GSB_invlist)
+#define PL_GSB_invlist (my_vars->GSB_invlist)
+#define PL_SCX_invlist (my_vars->GSCX_invlist)
+#define PL_GSCX_invlist (my_vars->GSCX_invlist)
+#define PL_UpperLatin1 (my_vars->GUpperLatin1)
+#define PL_GUpperLatin1 (my_vars->GUpperLatin1)
+#define PL_WB_invlist (my_vars->GWB_invlist)
+#define PL_GWB_invlist (my_vars->GWB_invlist)
+#define PL_XPosix_ptrs (my_vars->GXPosix_ptrs)
+#define PL_GXPosix_ptrs (my_vars->GXPosix_ptrs)
#define PL_appctx (my_vars->Gappctx)
#define PL_Gappctx (my_vars->Gappctx)
#define PL_check (my_vars->Gcheck)
@@ -462,6 +467,20 @@
#define PL_Gtimesbase (my_vars->Gtimesbase)
#define PL_use_safe_putenv (my_vars->Guse_safe_putenv)
#define PL_Guse_safe_putenv (my_vars->Guse_safe_putenv)
+#define PL_utf8_foldable (my_vars->Gutf8_foldable)
+#define PL_Gutf8_foldable (my_vars->Gutf8_foldable)
+#define PL_utf8_idcont (my_vars->Gutf8_idcont)
+#define PL_Gutf8_idcont (my_vars->Gutf8_idcont)
+#define PL_utf8_idstart (my_vars->Gutf8_idstart)
+#define PL_Gutf8_idstart (my_vars->Gutf8_idstart)
+#define PL_utf8_perl_idcont (my_vars->Gutf8_perl_idcont)
+#define PL_Gutf8_perl_idcont (my_vars->Gutf8_perl_idcont)
+#define PL_utf8_perl_idstart (my_vars->Gutf8_perl_idstart)
+#define PL_Gutf8_perl_idstart (my_vars->Gutf8_perl_idstart)
+#define PL_utf8_xidcont (my_vars->Gutf8_xidcont)
+#define PL_Gutf8_xidcont (my_vars->Gutf8_xidcont)
+#define PL_utf8_xidstart (my_vars->Gutf8_xidstart)
+#define PL_Gutf8_xidstart (my_vars->Gutf8_xidstart)
#define PL_veto_cleanup (my_vars->Gveto_cleanup)
#define PL_Gveto_cleanup (my_vars->Gveto_cleanup)
#define PL_watch_pvx (my_vars->Gwatch_pvx)