From: Eric Wong <e@80x24.org>
To: mwrap-perl@80x24.org
Subject: [PATCH 5/7] script/mwrap-perl: more portable Mwrap.so detection
Date: Sat, 2 Nov 2019 02:03:29 +0000 [thread overview]
Message-ID: <20191102020331.28050-6-e@80x24.org> (raw)
In-Reply-To: <20191102020331.28050-1-e@80x24.org>
@DynaLoader::dl_shared_objects is a documented interface in
DynaLoader(3pm), so we can use that instead of relying on
/proc/$$/maps on Linux.
---
script/mwrap-perl | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/script/mwrap-perl b/script/mwrap-perl
index 5e5eec4..8d372eb 100644
--- a/script/mwrap-perl
+++ b/script/mwrap-perl
@@ -3,22 +3,8 @@
# License: GPL-2.0+ <https://www.gnu.org/licenses/gpl-2.0.txt>
use strict;
use Devel::Mwrap;
-my $so;
-if ($^O eq 'linux') {
- my $maps = do {
- open my $fh, '<', "/proc/$$/maps" or
- die "/proc/$$/maps not accessible: $!\n";
- local $/;
- <$fh>;
- };
- if ($maps =~ m![ \t](/[^\n]+?/Mwrap\.so)$!sm) {
- $so = $1;
- } else {
- die "Mwrap.so not found in: $so\n";
- }
-} else {
- die "unsupported OS ($^O ne 'linux')";
-}
+my ($so) = grep(m!/Mwrap\.so\z!, @DynaLoader::dl_shared_objects);
+defined($so) or die 'Mwrap.so not loaded';
my $cur = $ENV{LD_PRELOAD};
if (defined $cur) {
my @cur = split(/[: \t]+/, $cur);
next prev parent reply other threads:[~2019-11-02 2:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-02 2:03 [PATCH 0/7] updates while I learn XS and perlapi Eric Wong
2019-11-02 2:03 ` [PATCH 1/7] allow using "-d:Mwrap" from the command-line Eric Wong
2019-11-02 2:03 ` [PATCH 2/7] use ppport.h for caller_cx with older Perl versions Eric Wong
2019-11-02 2:03 ` [PATCH 3/7] memalign: perform rcu_read_unlock on ENOMEM Eric Wong
2019-11-02 2:03 ` [PATCH 4/7] update_stats_rcu_lock: favor PL_curcop instead of caller_cx Eric Wong
2019-11-02 2:03 ` Eric Wong [this message]
2019-11-02 2:03 ` [PATCH 6/7] support Devel::Mwrap::each with callback Eric Wong
2019-11-02 2:03 ` [PATCH 7/7] t/mwrap: don't dump unless we check the output Eric Wong
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=20191102020331.28050-6-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).