Merge pull request #7 from Dual-Life/develop

1.59 Prevent XSLoader call on non-threaded Perl

Author: Jerry D. Hedden

Changes

@@ -3,6 +3,9 @@ Revision history for Perl extension threads::shared.
 -
 	-
 
+1.59 Wed Nov 28 03:53:14 2018
+	- Prevent XSLoader call on non-threaded Perl
+
 1.58 Mon Jan 22 20:09:07 EST 2018
 	- Fix CLANG macros.
 	- Sync with blead.

README

@@ -1,4 +1,4 @@
-threads::shared version 1.58
+threads::shared version 1.59
 ============================
 
 This module needs Perl 5.8.0 or later compiled with USEITHREADS.

lib/threads/shared.pm

@@ -4,10 +4,11 @@ use 5.008;
 
 use strict;
 use warnings;
+use Config;
 
 use Scalar::Util qw(reftype refaddr blessed);
 
-our $VERSION = '1.58'; # Please update the pod, too.
+our $VERSION = '1.59'; # Please update the pod, too.
 my $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
@@ -18,7 +19,7 @@ $threads::shared::threads_shared = 1;
 $threads::shared::clone_warn = undef;
 
 # Load the XS code, if applicable
-if ($threads::threads) {
+if ($Config::Config{'useithreads'} && $threads::threads) {
     require XSLoader;
     XSLoader::load('threads::shared', $XS_VERSION);
 
@@ -195,7 +196,7 @@ threads::shared - Perl extension for sharing data structures between threads
 
 =head1 VERSION
 
-This document describes threads::shared version 1.58
+This document describes threads::shared version 1.59
 
 =head1 SYNOPSIS
 

t/test.pl

@@ -19,6 +19,7 @@
 # In this file, we use the latter "Baby Perl" approach, and increment
 # will be worked over by t/op/inc.t
 
+$| = 1;
 $Level = 1;
 my $test = 1;
 my $planned;
@@ -1746,4 +1747,18 @@ ($;$)
     }
 }
 
+# Orphaned Docker or Linux containers do not necessarily attach to PID 1. They might attach to 0 instead.
+sub is_linux_container {
+
+    if ($^O eq 'linux' && open my $fh, '<', '/proc/1/cgroup') {
+        while(<$fh>) {
+            if (m{^\d+:pids:(.*)} && $1 ne '/init.scope') {
+                return 1;
+            }
+        }
+    }
+
+    return 0;
+}
+
 1;