From: Eric Wong <e@80x24.org>
To: mwrap-perl@80x24.org
Subject: [PATCH] do not access aTHR when in a non-Perl process
Date: Thu, 15 Sep 2022 20:31:59 +0000 [thread overview]
Message-ID: <20220915203159.2253027-1-e@80x24.org> (raw)
This is needed to avoid segfaults in non-Perl processes
such as `cmake'.
Fixes: 3197316f33fdc5d4 "create the `totals' rculfhash as early as possible"
---
Mwrap.xs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Mwrap.xs b/Mwrap.xs
index 092aaf4..31e9394 100644
--- a/Mwrap.xs
+++ b/Mwrap.xs
@@ -344,18 +344,20 @@ update_stats_rcu_lock(size_t *generation, size_t size, uintptr_t caller)
struct src_loc *k, *ret = 0;
static const size_t xlen = sizeof(caller);
char *dst;
- const COP *cop;
+ const COP *cop = NULL;
struct cds_lfht *t = CMM_LOAD_SHARED(totals);
if (caa_unlikely(!t)) return 0;
if (locating++) goto out; /* do not recurse into another *alloc */
*generation = uatomic_add_return(&total_bytes_inc, size);
+ if (&PL_thr_key) { /* are we even in a Perl process? */
#ifdef PERL_IMPLICIT_CONTEXT
- cop = aTHX ? PL_curcop : 0;
+ if (aTHX) cop = PL_curcop;
#else
- cop = &locating == root_locating ? PL_curcop : 0;
+ if (&locating == root_locating) cop = PL_curcop;
#endif
+ }
rcu_read_lock();
if (cop) {
const char *ptr = OutCopFILE(cop);
reply other threads:[~2022-09-15 20:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220915203159.2253027-1-e@80x24.org \
--to=e@80x24.org \
--cc=mwrap-perl@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mwrap-perl.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).