threads-shared-1.57

but keep our taint appveyor fix for t/waithires.t

Author: rurban

Porting/Maintainers.pl

@@ -1440,7 +1440,7 @@ package Maintainers;
     },
 
     'threads::shared' => {
-        'DISTRIBUTION' => 'JDHEDDEN/threads-shared-1.52.tar.gz',
+        'DISTRIBUTION' => 'JDHEDDEN/threads-shared-1.57.tar.gz',
         'FILES'        => q[dist/threads-shared],
         'EXCLUDED'     => [
             qw( examples/class.pl
@@ -1449,6 +1449,7 @@ package Maintainers;
                 t/test.pl
                 ),
         ],
+        'CUSTOMIZED'   => [ qw( t/waithires.t ) ],
     },
 
     'Tie::File' => {

dist/Module-CoreList/lib/Module/CoreList.pm

@@ -16187,6 +16187,7 @@ our %delta = (
             'Test::Harness'         => '3.39',
             'Thread::Queue'         => '3.12',
             'threads'               => '2.18_01',
+            'threads::shared'       => '1.57',
             'Time::HiRes'           => '1.9751',
             'Time::Piece'           => '1.3203',
             'Unicode::Collate'      => '1.25_01',

dist/threads-shared/lib/threads/shared.pm

@@ -7,7 +7,7 @@ use warnings;
 
 use Scalar::Util qw(reftype refaddr blessed);
 
-our $VERSION = '1.52'; # Please update the pod, too.
+our $VERSION = '1.57'; # Please update the pod, too.
 my $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
@@ -195,7 +195,7 @@ threads::shared - Perl extension for sharing data structures between threads
 
 =head1 VERSION
 
-This document describes threads::shared version 1.52
+This document describes threads::shared version 1.57
 
 =head1 SYNOPSIS
 
@@ -570,16 +570,18 @@ not propagate the blessing to the shared reference:
 Therefore, you should bless objects before sharing them.
 
 It is often not wise to share an object unless the class itself has been
-written to support sharing.  For example, an object's destructor may get
-called multiple times, once for each thread's scope exit.  Another danger is
-that the contents of hash-based objects will be lost due to the above
-mentioned limitation.  See F<examples/class.pl> (in the CPAN distribution of
-this module) for how to create a class that supports object sharing.
+written to support sharing.  For example, a shared object's destructor may
+get called multiple times, once for each thread's scope exit, or may not
+get called at all if it is embedded inside another shared object.  Another
+issue is that the contents of hash-based objects will be lost due to the
+above mentioned limitation.  See F<examples/class.pl> (in the CPAN
+distribution of this module) for how to create a class that supports object
+sharing.
 
 Destructors may not be called on objects if those objects still exist at
 global destruction time.  If the destructors must be called, make sure
 there are no circular references and that nothing is referencing the
-objects, before the program ends.
+objects before the program ends.
 
 Does not support C<splice> on arrays.  Does not support explicitly changing
 array lengths via $#array -- use C<push> and C<pop> instead.

dist/threads-shared/shared.xs

@@ -656,7 +656,18 @@ Perl_sharedsv_cond_timedwait(perl_cond *cond, perl_mutex *mut, double abs)
     abs -= (NV)ts.tv_sec;
     ts.tv_nsec = (long)(abs * 1000000000.0);
 
+#if defined(CLANG_DIAG_IGNORE)
+    CLANG_DIAG_IGNORE(-Wthread-safety);
+    /* warning: calling function 'pthread_cond_timedwait' requires holding mutex 'mut' exclusively [-Wthread-safety-analysis] */
+#endif
+
     switch (pthread_cond_timedwait(cond, mut, &ts)) {
+
+/* perl.h defines CLANG_DIAG_* but only in 5.24+ */
+#if defined(CLANG_DIAG_RESTORE)
+CLANG_DIAG_RESTORE;
+#endif
+
         case 0:         got_it = 1; break;
         case ETIMEDOUT:             break;
 #ifdef OEMVS
@@ -1094,8 +1105,9 @@ sharedsv_array_mg_CLEAR(pTHX_ SV *sv, MAGIC *mg)
                 if (!sv) continue;
                 if ( (SvOBJECT(sv) || (SvROK(sv) && (sv = SvRV(sv))))
                   && SvREFCNT(sv) == 1 ) {
-                    SV *tmp = Perl_sv_newmortal(caller_perl);
+                    SV *tmp;
                     PERL_SET_CONTEXT((aTHX = caller_perl));
+                    tmp = sv_newmortal();
                     sv_upgrade(tmp, SVt_RV);
                     get_RV(tmp, sv);
                     PERL_SET_CONTEXT((aTHX = PL_sharedsv_space));
@@ -1374,8 +1386,9 @@ STORESIZE(SV *obj,IV count)
                 if (   (SvOBJECT(sv) || (SvROK(sv) && (sv = SvRV(sv))))
                     && SvREFCNT(sv) == 1 )
                 {
-                    SV *tmp = Perl_sv_newmortal(caller_perl);
+                    SV *tmp;
                     PERL_SET_CONTEXT((aTHX = caller_perl));
+                    tmp = sv_newmortal();
                     sv_upgrade(tmp, SVt_RV);
                     get_RV(tmp, sv);
                     PERL_SET_CONTEXT((aTHX = PL_sharedsv_space));

dist/threads-shared/t/object2.t

@@ -17,7 +17,7 @@ use ExtUtils::testlib;
 
 BEGIN {
     $| = 1;
-    print("1..131\n");   ### Number of tests that will be run ###
+    print("1..133\n");   ### Number of tests that will be run ###
 };
 
 use threads;
@@ -445,6 +445,28 @@ ok($destroyed[$ID], 'Scalar object removed from shared scalar');
     ::ok($count == $n, "remove array object by undef");
 }
 
+# RT #131124
+# Emptying a shared array creates new temp SVs. If there are no spare
+# SVs, a new arena is allocated. shared.xs was mallocing a new arena
+# with the wrong perl context set, meaning that when the arena was later
+# freed, it would "panic: realloc from wrong pool"
+#
+
+{
+    threads->new(sub {
+        my @a :shared;
+        push @a, bless &threads::shared::share({}) for 1..1000;
+        undef @a; # this creates lots of temp SVs
+    })->join;
+    ok(1, "#131124 undef array doesnt panic");
+
+    threads->new(sub {
+        my @a :shared;
+        push @a, bless &threads::shared::share({}) for 1..1000;
+        @a = (); # this creates lots of temp SVs
+    })->join;
+    ok(1, "#131124 clear array doesnt panic");
+}
 
 
 # EOF

pod/perlcdelta.pod

@@ -243,6 +243,8 @@ Updated from 3.01, many critical fixes.
 
 =item L<threads>  2.18_01
 
+=item L<threads::shared>  1.57
+
 =item L<Time::HiRes>  1.9751
 
 =item L<Time::Piece>  1.3203

t/porting/customized.dat

@@ -101,6 +101,7 @@ lib dist/lib/lib_pm.PL 6f1951dc926375aa93b93515aa5f3c1ca1396b05
 threads dist/threads/lib/threads.pm 532c5f595f81666fa7ff534a919cbf679dae9b8a
 threads dist/threads/t/locale.t 9a2a5b43a39867590eb288d4a1759abac2052aa8
 threads dist/threads/threads.xs 030620f4374ad62176e3c5d4d24b2dbd90a12b69
+threads::shared dist/threads-shared/t/waithires.t dc867159fd2fa8c09326cd7627f5a0635ca5e3b5
 version cpan/version/lib/version.pm 46e7b7eed74b5080b23f852acd84e6ca5aab6d74
 version cpan/version/lib/version/regex.pm a2e6098571d8085340d4378ec21ad54bbcce1ceb
 version vutil.c 9112461d000e5d9ad60de8105fb803a639cbe020