mirror/perl
1
0
Fork 0
mirror of https://github.com/Perl/perl5.git synced 2026-01-26 08:38:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add mutex for accessing ENV

Browse Source
This commit is contained in:
Karl Williamson 2020-02-20 16:51:31 -07:00
parent b6d9446cec
commit 2bc5f86adf
11 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dosish.h
View File

@ -51,7 +51,8 @@
# define PERL_SYS_TERM_BODY() \
HINTS_REFCNT_TERM; KEYWORD_PLUGIN_MUTEX_TERM; \
OP_CHECK_MUTEX_TERM; OP_REFCNT_TERM; PERLIO_TERM; \
MALLOC_TERM; LOCALE_TERM; USER_PROP_MUTEX_TERM;
MALLOC_TERM; LOCALE_TERM; USER_PROP_MUTEX_TERM; \
ENV_TERM;
#endif
#define dXSUB_SYS dNOOP

2
embedvar.h
View File

@ -397,6 +397,8 @@
#define PL_Gdo_undump (my_vars->Gdo_undump)
#define PL_dollarzero_mutex (my_vars->Gdollarzero_mutex)
#define PL_Gdollarzero_mutex (my_vars->Gdollarzero_mutex)
#define PL_env_mutex (my_vars->Genv_mutex)
#define PL_Genv_mutex (my_vars->Genv_mutex)
#define PL_fold_locale (my_vars->Gfold_locale)
#define PL_Gfold_locale (my_vars->Gfold_locale)
#define PL_hash_chars (my_vars->Ghash_chars)

1
makedef.pl
View File

@ -399,6 +399,7 @@ unless ($define{'USE_ITHREADS'}) {
PL_regex_pad
PL_regex_padav
PL_dollarzero_mutex
PL_env_mutex
PL_hints_mutex
PL_locale_mutex
PL_lc_numeric_mutex

1
perl.c
View File

@ -96,6 +96,7 @@ S_init_tls_and_interp(PerlInterpreter *my_perl)
HINTS_REFCNT_INIT;
LOCALE_INIT;
USER_PROP_MUTEX_INIT;
ENV_INIT;
MUTEX_INIT(&PL_dollarzero_mutex);
MUTEX_INIT(&PL_my_ctx_mutex);
# endif

15
perl.h
View File

@ -2907,6 +2907,21 @@ typedef struct padname PADNAME;
# define USE_ENVIRON_ARRAY
#endif
#ifdef USE_ITHREADS
/* On some platforms it would be safe to use a read/write mutex with many
* readers possible at the same time. On other platforms, notably IBM ones,
* subsequent getenv calls destroy earlier ones. Those platforms would not
* be able to handle simultaneous getenv calls */
# define ENV_LOCK MUTEX_LOCK(&PL_env_mutex)
# define ENV_UNLOCK MUTEX_UNLOCK(&PL_env_mutex)
# define ENV_INIT MUTEX_INIT(&PL_env_mutex);
# define ENV_TERM MUTEX_DESTROY(&PL_env_mutex);
#else
# define ENV_LOCK NOOP;
# define ENV_UNLOCK NOOP;
# define ENV_INIT NOOP;
# define ENV_TERM NOOP;
#endif
#if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
/* having sigaction(2) means that the OS supports both 1-arg and 3-arg

2
perlapi.h
View File

@ -119,6 +119,8 @@ END_EXTERN_C
#define PL_do_undump (*Perl_Gdo_undump_ptr(NULL))
#undef PL_dollarzero_mutex
#define PL_dollarzero_mutex (*Perl_Gdollarzero_mutex_ptr(NULL))
#undef PL_env_mutex
#define PL_env_mutex (*Perl_Genv_mutex_ptr(NULL))
#undef PL_fold_locale
#define PL_fold_locale (*Perl_Gfold_locale_ptr(NULL))
#undef PL_hash_chars

1
perlvars.h
View File

@ -104,6 +104,7 @@ PERLVARI(G, mmap_page_size, IV, 0)
#if defined(USE_ITHREADS)
PERLVAR(G, hints_mutex, perl_mutex) /* Mutex for refcounted he refcounting */
PERLVAR(G, env_mutex, perl_mutex) /* Mutex for accessing ENV */
# if ! defined(USE_THREAD_SAFE_LOCALE) || defined(TS_W32_BROKEN_LOCALECONV)
PERLVAR(G, locale_mutex, perl_mutex) /* Mutex for setlocale() changing */
# endif

2
symbian/symbianish.h
View File

@ -122,7 +122,7 @@
#ifndef PERL_SYS_TERM_BODY
#define PERL_SYS_TERM_BODY() HINTS_REFCNT_TERM; OP_REFCNT_TERM; \
PERLIO_TERM; MALLOC_TERM; CloseSTDLIB(); \
LOCALE_TERM
LOCALE_TERM; ENV_TERM;
#endif

4
unixish.h
View File

@ -142,6 +142,7 @@ int afstat(int fd, struct stat *statb);
HINTS_REFCNT_TERM; KEYWORD_PLUGIN_MUTEX_TERM; \
OP_CHECK_MUTEX_TERM; OP_REFCNT_TERM; PERLIO_TERM; \
MALLOC_TERM; LOCALE_TERM; USER_PROP_MUTEX_TERM; \
ENV_TERM; \
amigaos4_dispose_fork_array();
#endif
@ -154,7 +155,8 @@ int afstat(int fd, struct stat *statb);
# define PERL_SYS_TERM_BODY() \
HINTS_REFCNT_TERM; KEYWORD_PLUGIN_MUTEX_TERM; \
OP_CHECK_MUTEX_TERM; OP_REFCNT_TERM; PERLIO_TERM; \
MALLOC_TERM; LOCALE_TERM; USER_PROP_MUTEX_TERM;
MALLOC_TERM; LOCALE_TERM; USER_PROP_MUTEX_TERM; \
ENV_TERM;
#endif

3
vms/vmsish.h
View File

@ -310,7 +310,8 @@ struct interp_intern {
#define BIT_BUCKET "/dev/null"
#define PERL_SYS_INIT_BODY(c,v) MALLOC_CHECK_TAINT2(*c,*v) vms_image_init((c),(v)); PERLIO_INIT; MALLOC_INIT
#define PERL_SYS_TERM_BODY() HINTS_REFCNT_TERM; OP_REFCNT_TERM; \
PERLIO_TERM; MALLOC_TERM; LOCALE_TERM
PERLIO_TERM; MALLOC_TERM; LOCALE_TERM \
ENV_TERM;
#define dXSUB_SYS dNOOP
#define HAS_KILL
#define HAS_WAIT

1
win32/win32.c
View File

@ -4553,6 +4553,7 @@ Perl_win32_term(void)
PERLIO_TERM;
MALLOC_TERM;
LOCALE_TERM;
ENV_TERM;
#ifndef WIN32_NO_REGISTRY
/* handles might be NULL, RegCloseKey then returns ERROR_INVALID_HANDLE
but no point of checking and we can't die() at this point */