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 /intrpvar.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 'intrpvar.h')
| -rw-r--r-- | intrpvar.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/intrpvar.h b/intrpvar.h index f604ef9426..1f69ab277a 100644 --- a/intrpvar.h +++ b/intrpvar.h @@ -772,9 +772,6 @@ PERLVARI(I, globhook, globhook_t, NULL) #ifdef PERL_IMPLICIT_CONTEXT PERLVARI(I, my_cxt_list, void **, NULL) /* per-module array of MY_CXT pointers */ PERLVARI(I, my_cxt_size, int, 0) /* size of PL_my_cxt_list */ -# ifdef PERL_GLOBAL_STRUCT_PRIVATE -PERLVARI(I, my_cxt_keys, const char **, NULL) /* per-module array of pointers to MY_CXT_KEY constants */ -# endif #endif #if defined(PERL_IMPLICIT_CONTEXT) || defined(PERL_DEBUG_READONLY_COW) |