diff options
| author | David Mitchell <davem@iabyn.com> | 2019-02-18 09:29:29 +0000 |
|---|---|---|
| committer | David Mitchell <davem@iabyn.com> | 2019-02-19 13:28:12 +0000 |
| commit | 04912be77a628a4643d16a99a332a73853926079 (patch) | |
| tree | 78057c2aed6b7fb0a330616a8c235cd6c5e73346 /perlvars.h | |
| parent | 61d4c87c940fea028f08f27addc275b469320fda (diff) | |
| download | perl-04912be77a628a4643d16a99a332a73853926079.tar.gz | |
fix thread issue with PERL_GLOBAL_STRUCT
The MY_CXT subsystem allows per-thread pseudo-static data storage.
Part of the implementation for this involves each XS module being
assigned a unique index in its my_cxt_index static var when first
loaded.
Because PERL_GLOBAL_STRUCT bans any static vars, under those builds
there is instead a table which maps the MY_CXT_KEY identifying string to
index.
Unfortunately, this table was allocated per-interpreter rather than
globally, meaning if multiple threads tried to load the same XS module,
crashes could ensue.
This manifested itself in failures in
ext/XS-APItest/t/keyword_plugin_threads.t
The fix is relatively straightforward: allocate PL_my_cxt_keys globally
rather than per-interpreter.
Also record the size of this struct in a new var, PL_my_cxt_keys_size,
rather than doing double duty on PL_my_cxt_size.
Diffstat (limited to 'perlvars.h')
| -rw-r--r-- | perlvars.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/perlvars.h b/perlvars.h index ae34a1e583..be56d5407a 100644 --- a/perlvars.h +++ b/perlvars.h @@ -337,3 +337,13 @@ PERLVARI(G, strategy_socket, int, 0) /* doio.c */ PERLVARI(G, strategy_accept, int, 0) /* doio.c */ PERLVARI(G, strategy_pipe, int, 0) /* doio.c */ PERLVARI(G, strategy_socketpair, int, 0) /* doio.c */ + +#ifdef PERL_IMPLICIT_CONTEXT +# ifdef PERL_GLOBAL_STRUCT_PRIVATE +/* per-module array of pointers to MY_CXT_KEY constants. + * It simulates each module having a static my_cxt_index var on builds + * which don't allow static vars */ +PERLVARI(G, my_cxt_keys, const char **, NULL) +PERLVARI(G, my_cxt_keys_size, int, 0) /* size of PL_my_cxt_keys */ +# endif +#endif |