threads: Update to 2.16_01

Fix Clang macro backward compatibility per patch by Andy Grundman

cperl: Keep the old better pod, bump to 2.16_01.
The old pod had the technical explanation, why ithreads are slow, how it
works and why fork is preferred.
Keep our modglobal fix on global destruction from our 2.12_01 (upstream
still broken).

Author: rurban

MANIFEST

@@ -3874,6 +3874,7 @@ dist/threads/t/stress_cv.t	Test with multiple threads, coderef cv argument.
 dist/threads/t/stress_re.t	Test with multiple threads, string cv argument and regexes.
 dist/threads/t/stress_string.t	Test with multiple threads, string cv argument.
 dist/threads/t/thread.t		General ithread tests from thr5005
+dist/threads/t/unique.t
 dist/threads/threads.xs		ithreads
 dist/threads-shared/Changes		threads::shared ChangeLog
 dist/threads-shared/hints/linux.pl	thread shared variables

Porting/Maintainers.pl

@@ -1460,7 +1460,7 @@ package Maintainers;
     },
 
     'threads' => {
-        'DISTRIBUTION' => 'JDHEDDEN/threads-2.15.tar.gz',
+        'DISTRIBUTION' => 'JDHEDDEN/threads-2.16.tar.gz',
         'FILES'        => q[dist/threads],
         'EXCLUDED'     => [
             qr{^examples/},
@@ -1469,12 +1469,15 @@ package Maintainers;
                 threads.h
                 ),
           ],
-        # protect ithread_free from deleted PL_modglobal
-        #'CUSTOMIZED'   => [
-        #    qw( threads.xs
-        #        lib/threads.pm
-        #      ),
-        #],
+          # test locale race #127708
+          # use old pod, tech. explanation: slow, rather use fork
+          # fix my_pool init in global destruction
+        'CUSTOMIZED'   => [
+            qw( t/locale.t
+                lib/threads.pm
+                threads.xs
+              ),
+          ],
     },
 
     'threads::shared' => {

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

@@ -14978,6 +14978,7 @@ our %delta = (
             'Net::Ping'             => '2.61',
             'Search::Dict'          => '1.07_01',
             'SelectSaver'           => '1.02_01',
+            'threads'               => '2.16_01',
             'VMS::Studio'           => '2.41_01',
         },
         removed => {
@@ -15154,6 +15155,7 @@ our %delta = (
             'SelectSaver'           => '1.02_01',
             'Storable'              => '3.05_13',
             'strict'                => '1.13c',
+            'threads'               => '2.16_01',
             'VMS::Studio'           => '2.41_01',
             'Win32API::File'        => '0.1204',
         },

dist/threads/Changes

@@ -1,5 +1,9 @@
 Revision history for Perl extension threads.
 
+2.16 Sun May  7 22:32:59 2017
+	- Fix Clang macro backward compatibility per patch by Andy Grundman
+	- Sync from blead
+
 2.15 Sun Feb 26 22:45:33 2017
 	- Sync from blead
 

dist/threads/lib/threads.pm

@@ -5,7 +5,7 @@ use 5.008;
 use strict;
 use warnings;
 
-our $VERSION = '2.15';
+our $VERSION = '2.16_01';
 my $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
@@ -29,7 +29,8 @@ $threads::threads = 1;
 
 # Load the XS code
 require XSLoader;
-XSLoader::load("threads", $XS_VERSION);
+XSLoader::load('threads', $XS_VERSION);
+
 
 ### Export ###
 
@@ -133,7 +134,7 @@ threads - Perl interpreter-based threads
 
 =head1 VERSION
 
-This document describes threads version 2.15
+This document describes threads version 2.16
 
 =head1 WARNING
 

dist/threads/t/exit.t

@@ -48,7 +48,7 @@ my $rc = $thr->join();
 ok(! defined($rc), 'Exited: threads->exit()');
 
 
-run_perl(prog => 'use threads 2.15;' .
+run_perl(prog => 'use threads 2.16;' .
                  'threads->exit(86);' .
                  'exit(99);',
          nolib => ($ENV{PERL_CORE}) ? 0 : 1,
@@ -98,7 +98,7 @@ $rc = $thr->join();
 ok(! defined($rc), 'Exited: $thr->set_thread_exit_only');
 
 
-run_perl(prog => 'use threads 2.15 qw(exit thread_only);' .
+run_perl(prog => 'use threads 2.16 qw(exit thread_only);' .
                  'threads->create(sub { exit(99); })->join();' .
                  'exit(86);',
          nolib => ($ENV{PERL_CORE}) ? 0 : 1,
@@ -108,7 +108,7 @@ run_perl(prog => 'use threads 2.15 qw(exit thread_only);' .
     is($?>>8, 86, "'use threads 'exit' => 'thread_only'");
 }
 
-my $out = run_perl(prog => 'use threads 2.15;' .
+my $out = run_perl(prog => 'use threads 2.16;' .
                            'threads->create(sub {' .
                            '    exit(99);' .
                            '});' .
@@ -124,7 +124,7 @@ my $out = run_perl(prog => 'use threads 2.15;' .
 like($out, qr/1 finished and unjoined/, "exit(status) in thread");
 
 
-$out = run_perl(prog => 'use threads 2.15 qw(exit thread_only);' .
+$out = run_perl(prog => 'use threads 2.16 qw(exit thread_only);' .
                         'threads->create(sub {' .
                         '   threads->set_thread_exit_only(0);' .
                         '   exit(99);' .
@@ -141,7 +141,7 @@ $out = run_perl(prog => 'use threads 2.15 qw(exit thread_only);' .
 like($out, qr/1 finished and unjoined/, "set_thread_exit_only(0)");
 
 
-run_perl(prog => 'use threads 2.15;' .
+run_perl(prog => 'use threads 2.16;' .
                  'threads->create(sub {' .
                  '   $SIG{__WARN__} = sub { exit(99); };' .
                  '   die();' .

dist/threads/t/problems.t

@@ -21,18 +21,14 @@ BEGIN {
 
     $| = 1;
     if ($] == 5.008) {
-        print("1..11\n");   ### Number of tests that will be run ###
+        print("1..6\n");    ### Number of tests that will be run ###
     } else {
-        print("1..15\n");   ### Number of tests that will be run ###
+        print("1..10\n");   ### Number of tests that will be run ###
     }
 };
 
 print("ok 1 - Loaded\n");
 
-### Start of Testing ###
-
-no warnings 'deprecated';       # Suppress warnings related to :unique
-
 use Hash::Util 'lock_keys';
 
 my $test :shared = 2;
@@ -93,50 +89,6 @@ if ($] != 5.008)
 }
 
 
-# bugid 24383 - :unique hashes weren't being made readonly on interpreter
-# clone; check that they are.
-
-our $unique_scalar : unique;
-our @unique_array : unique;
-our %unique_hash : unique;
-threads->create(sub {
-        lock($test);
-        my $TODO = ":unique needs to be re-implemented in a non-broken way";
-        eval { $unique_scalar = 1 };
-        print $@ =~ /read-only/
-          ? '' : 'not ', "ok $test # TODO $TODO - unique_scalar\n";
-        $test++;
-        eval { $unique_array[0] = 1 };
-        print $@ =~ /read-only/
-          ? '' : 'not ', "ok $test # TODO $TODO - unique_array\n";
-        $test++;
-        if ($] >= 5.008003 && $^O ne 'MSWin32') {
-            eval { $unique_hash{abc} = 1 };
-            print $@ =~ /disallowed/
-              ? '' : 'not ', "ok $test # TODO $TODO - unique_hash\n";
-        } else {
-            print("ok $test # SKIP $TODO - unique_hash\n");
-        }
-        $test++;
-    })->join;
-
-# bugid #24940 :unique should fail on my and sub declarations
-
-for my $decl ('my $x : unique', 'sub foo : unique') {
-    {
-        lock($test);
-        if ($] >= 5.008005) {
-            eval $decl;
-            print $@ =~ /^The 'unique' attribute may only be applied to 'our' variables/
-                    ? '' : 'not ', "ok $test - $decl\n";
-        } else {
-            print("ok $test # SKIP $decl\n");
-        }
-        $test++;
-    }
-}
-
-
 # Returning a closure from a thread caused problems. If the last index in
 # the anon sub's pad wasn't for a lexical, then a core dump could occur.
 # Otherwise, there might be leaked scalars.

dist/threads/t/thread.t

@@ -161,7 +161,7 @@ package main;
 
 # bugid #24165
 
-run_perl(prog => 'use threads 2.15;' .
+run_perl(prog => 'use threads 2.16;' .
                  'sub a{threads->create(shift)} $t = a sub{};' .
                  '$t->tid; $t->join; $t->tid',
          nolib => ($ENV{PERL_CORE}) ? 0 : 1,

dist/threads/t/unique.t

@@ -0,0 +1,81 @@
+use strict;
+use warnings;
+
+BEGIN {
+    use Config;
+    if (! $Config{'useithreads'}) {
+        print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
+        exit(0);
+    }
+    if ($] >= 5.027000) {
+        print("1..0 # SKIP 'unique' attribute no longer exists\n");
+        exit(0);
+    }
+}
+
+use ExtUtils::testlib;
+
+use threads;
+
+BEGIN {
+    if (! eval 'use threads::shared; 1') {
+        print("1..0 # SKIP threads::shared not available\n");
+        exit(0);
+    }
+
+    $| = 1;
+    print("1..6\n") ;           ### Number of tests that will be run ###
+}
+
+print("ok 1 - Loaded\n");
+
+### Start of Testing ###
+
+no warnings 'deprecated';       # Suppress warnings related to :unique
+
+my $test :shared = 2;
+
+# bugid 24383 - :unique hashes weren't being made readonly on interpreter
+# clone; check that they are.
+
+our $unique_scalar : unique;
+our @unique_array : unique;
+our %unique_hash : unique;
+threads->create(sub {
+        lock($test);
+        my $TODO = ":unique needs to be re-implemented in a non-broken way";
+        eval { $unique_scalar = 1 };
+        print $@ =~ /read-only/
+          ? '' : 'not ', "ok $test # TODO $TODO - unique_scalar\n";
+        $test++;
+        eval { $unique_array[0] = 1 };
+        print $@ =~ /read-only/
+          ? '' : 'not ', "ok $test # TODO $TODO - unique_array\n";
+        $test++;
+        if ($] >= 5.008003 && $^O ne 'MSWin32') {
+            eval { $unique_hash{abc} = 1 };
+            print $@ =~ /disallowed/
+              ? '' : 'not ', "ok $test # TODO $TODO - unique_hash\n";
+        } else {
+            print("ok $test # SKIP $TODO - unique_hash\n");
+        }
+        $test++;
+    })->join;
+
+# bugid #24940 :unique should fail on my and sub declarations
+
+for my $decl ('my $x : unique', 'sub foo : unique') {
+    {
+        lock($test);
+        if ($] >= 5.008005) {
+            eval $decl;
+            print $@ =~ /^The 'unique' attribute may only be applied to 'our' variables/
+                    ? '' : 'not ', "ok $test - $decl\n";
+        } else {
+            print("ok $test # SKIP $decl\n");
+        }
+        $test++;
+    }
+}
+
+

dist/threads/threads.xs

@@ -20,7 +20,6 @@
 #endif
 #ifdef HAS_PPPORT_H
 #  define NEED_PL_signals
-#  define NEED_newRV_noinc
 #  define NEED_sv_2pv_flags
 #  include "ppport.h"
 #  include "threads.h"
@@ -133,9 +132,9 @@ typedef struct {
     IV page_size;
 } my_pool_t;
 
-#define dMY_POOL                                                    \
-    SV *my_pool_sv = *hv_fetch(PL_modglobal, MY_POOL_KEY,           \
-                               sizeof(MY_POOL_KEY)-1, TRUE);        \
+#define dMY_POOL \
+    SV *my_pool_sv = *hv_fetch(PL_modglobal, MY_POOL_KEY,               \
+                               sizeof(MY_POOL_KEY)-1, TRUE);            \
     my_pool_t *my_poolp = INT2PTR(my_pool_t*, SvUV(my_pool_sv))
 
 #define MY_POOL_set                                                 \
@@ -1031,10 +1030,13 @@ S_ithread_create(
     MUTEX_UNLOCK(&my_pool->create_destruct_mutex);
     return (thread);
 
+#if defined(CLANG_DIAG_IGNORE)
     CLANG_DIAG_IGNORE(-Wthread-safety);
     /* warning: mutex 'thread->mutex' is not held on every path through here [-Wthread-safety-analysis] */
+#endif
 }
-#if defined(__clang__) || defined(__clang)
+/* perl.h defines CLANG_DIAG_* but only in 5.24+ */
+#if defined(CLANG_DIAG_RESTORE)
 CLANG_DIAG_RESTORE
 #endif
 
@@ -1506,7 +1508,9 @@ ithread_kill(...)
         MUTEX_UNLOCK(&thread->mutex);
 
         if (no_handler) {
-            Perl_croak(aTHX_ "Signal %s received in thread %" UVuf ", but no signal handler set.", sig_name, thread->tid);
+            Perl_croak(aTHX_ "Signal %s received in thread %" UVuf
+                             ", but no signal handler set.",
+                             sig_name, thread->tid);
         }
 
         /* Return the thread to allow for method chaining */
@@ -1830,6 +1834,7 @@ BOOT:
     SV *my_pool_sv = *hv_fetch(PL_modglobal, MY_POOL_KEY,
                                sizeof(MY_POOL_KEY)-1, TRUE);
     my_pool_t *my_poolp = (my_pool_t*)SvPVX(newSV(sizeof(my_pool_t)-1));
+
     MY_CXT_INIT;
 
     Zero(my_poolp, 1, my_pool_t);