threads-2.22_01

with backcompat thread_locale_init()

Author: rurban

Porting/Maintainers.pl

@@ -1473,7 +1473,8 @@ package Maintainers;
     },
 
     'threads' => {
-        'DISTRIBUTION' => 'JDHEDDEN/threads-2.16.tar.gz',
+        # https://github.com/rurban/threads/commits/cperl really
+        'DISTRIBUTION' => 'RURBAN/threads-2.22_01.tar.gz',
         'FILES'        => q[dist/threads],
         'EXCLUDED'     => [
             qr{^examples/},
@@ -1485,7 +1486,7 @@ package Maintainers;
           # test locale race #127708
           # use old pod, tech. explanation: slow, rather use fork
           # fix my_pool init in global destruction
-        'CUSTOMIZED'   => [
+         'CUSTOMIZED'   => [
             qw( t/locale.t
                 lib/threads.pm
                 threads.xs

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

@@ -17339,6 +17339,7 @@ for my $version ( sort { version_sort($a, $b) } keys %released ) {
             'Test::Harness'         => '3.42_01',
             'Term::ReadKey'         => '2.37_03',
             'Thread::Queue'         => '3.13',
+            'threads'               => '2.22_01',
             'Tie::Hash::NamedCapture' => '0.10_01',
             'Time::HiRes'           => '1.9758_01',
             'Time::Local'           => '1.28',

dist/threads/Changes

@@ -1,5 +1,16 @@
 Revision history for Perl extension threads.
 
+2.22_01 Fri Sep 7 13:00:29 2018 +0200 rurban
+        - locale safety backport
+
+2.22 Tue Jan 23 01:14:04 2018 +0100
+        - more locale safety from perl5
+
+2.21 Mon Jan 22 20:09:07 EST 2018
+	- Fix to CLANG macros
+	- Can return subs from threads.  See docs.
+	- Sync from blead
+
 2.16 Sun May  7 22:32:59 2017
 	- Fix Clang macro backward compatibility per patch by Andy Grundman
 	- Sync from blead
@@ -10,6 +21,9 @@ Revision history for Perl extension threads.
 2.14 Sun Feb 26 21:14:26 2017
 	- Sync from blead
 
+2.13_01 Sun Mar 5 19:27:49 2017 +0100
+        - locale safety from cperl
+
 2.13 Sun Feb 26 17:59:01 2017
 	- Added t/kill3.t to test that dir handles are thread-safe
 

dist/threads/lib/threads.pm

@@ -5,7 +5,7 @@ use 5.008;
 use strict;
 use warnings;
 
-our $VERSION = '2.22_01';
+our $VERSION = '2.22_01';      # remember to update version in POD!
 my $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
@@ -29,8 +29,7 @@ $threads::threads = 1;
 
 # Load the XS code
 require XSLoader;
-XSLoader::load('threads', $XS_VERSION);
-
+XSLoader::load("threads", $XS_VERSION);
 
 ### Export ###
 
@@ -134,7 +133,7 @@ threads - Perl interpreter-based threads
 
 =head1 VERSION
 
-This document describes threads version 2.21_01
+This document describes threads version 2.22_01 (with fixes from cperl)
 
 =head1 WARNING
 
@@ -953,11 +952,14 @@ setting.
 
 =item Locales
 
-Prior to Perl 5.28, locales could not be used with threads, due to various
-race conditions.  Starting in that release, on systems that implement
-thread-safe locale functions, threads can be used, with some caveats.
-This includes Windows starting with Visual Studio 2005, and systems compatible
-with POSIX 2008.  See L<perllocale/Multi-threaded operation>.
+Prior to Perl 5.28 or cperl 5.24 locales could not be used with
+threads, due to various race conditions.  Starting with Perl 5.28 on
+systems that implement thread-safe locale functions, threads can be
+used even on perl5 with some caveats. Previously only with cperl,
+but perl5 still has many unsolved issues.
+This includes Windows starting with Visual Studio 2005, and systems
+compatible with POSIX 2008.  See L<perllocale/Multi-threaded
+operation>.
 
 Each thread (except the main thread) is started using the C locale.  The main
 thread is started like all other Perl programs; see L<perllocale/ENVIRONMENT>.

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.16;' .
+run_perl(prog => 'use threads 2.21;' .
                  '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.16 qw(exit thread_only);' .
+run_perl(prog => 'use threads 2.21 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.16 qw(exit thread_only);' .
     is($?>>8, 86, "'use threads 'exit' => 'thread_only'");
 }
 
-my $out = run_perl(prog => 'use threads 2.16;' .
+my $out = run_perl(prog => 'use threads 2.21;' .
                            'threads->create(sub {' .
                            '    exit(99);' .
                            '});' .
@@ -124,7 +124,7 @@ my $out = run_perl(prog => 'use threads 2.16;' .
 like($out, qr/1 finished and unjoined/, "exit(status) in thread");
 
 
-$out = run_perl(prog => 'use threads 2.16 qw(exit thread_only);' .
+$out = run_perl(prog => 'use threads 2.21 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.16 qw(exit thread_only);' .
 like($out, qr/1 finished and unjoined/, "set_thread_exit_only(0)");
 
 
-run_perl(prog => 'use threads 2.16;' .
+run_perl(prog => 'use threads 2.21;' .
                  'threads->create(sub {' .
                  '   $SIG{__WARN__} = sub { exit(99); };' .
                  '   die();' .

dist/threads/t/thread.t

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

dist/threads/threads.xs

@@ -20,6 +20,7 @@
 #endif
 #ifdef HAS_PPPORT_H
 #  define NEED_PL_signals
+#  define NEED_newRV_noinc
 #  define NEED_sv_2pv_flags
 #  include "ppport.h"
 #  include "threads.h"
@@ -35,13 +36,20 @@
 #  endif
 #endif
 
+#if PERL_VERSION < 28
+#define thread_locale_init()
+#define thread_locale_term()
+#endif
+
 #ifndef CLANG_DIAG_IGNORE
 # define CLANG_DIAG_IGNORE(x)
 # define CLANG_DIAG_RESTORE
 #endif
 #ifndef CLANG_DIAG_IGNORE_STMT
 # define CLANG_DIAG_IGNORE_STMT(x) CLANG_DIAG_IGNORE(x) NOOP
 # define CLANG_DIAG_RESTORE_STMT CLANG_DIAG_RESTORE NOOP
+# define CLANG_DIAG_IGNORE_DECL(x) CLANG_DIAG_IGNORE(x) dNOOP
+# define CLANG_DIAG_RESTORE_DECL CLANG_DIAG_RESTORE dNOOP
 #endif
 
 #ifdef USE_ITHREADS
@@ -141,9 +149,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                                                 \
@@ -1046,10 +1054,10 @@ S_ithread_create(
     MUTEX_UNLOCK(&my_pool->create_destruct_mutex);
     return (thread);
 
-    CLANG_DIAG_IGNORE(-Wthread-safety)
+    CLANG_DIAG_IGNORE_STMT(-Wthread-safety);
     /* warning: mutex 'thread->mutex' is not held on every path through here [-Wthread-safety-analysis] */
 }
-CLANG_DIAG_RESTORE
+CLANG_DIAG_RESTORE_DECL;
 
 #endif /* USE_ITHREADS */
 
@@ -1852,7 +1860,6 @@ 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);

t/porting/customized.dat

@@ -154,9 +154,9 @@ lib dist/lib/lib_pm.PL 04a3dedbc657cac6c8db1faf2f0c6a7af328a23f
 parent cpan/parent/t/compile-time-file.t 3e77ec70c6e73121129f93cb35b7c64eb2244a52
 parent cpan/parent/t/parent-classfromclassfile.t 35cd01cc132734c0c6b3f078449d5f389d8ec330
 parent cpan/parent/t/parent-classfromfile.t d07fa9c555256958565b22bc6b7ac191a3de8f96
-threads dist/threads/lib/threads.pm 41851eadf0a612abbbf47bd5ee8c7583f72d8933
+threads dist/threads/lib/threads.pm 070834529ce90f9cd47f9113e0803f4f44f47629
 threads dist/threads/t/locale.t 9a2a5b43a39867590eb288d4a1759abac2052aa8
-threads dist/threads/threads.xs 3285711397bddf5b5e8ddc0669744d5f7a2a814f
+threads dist/threads/threads.xs 9d4c375efbcd56b57416c87406afec861bc01360
 threads::shared dist/threads-shared/t/waithires.t dc867159fd2fa8c09326cd7627f5a0635ca5e3b5
 version cpan/version/lib/version.pm 5c578896318efbc417130d977da356792954da03
 version cpan/version/lib/version/regex.pm ba583136e44d520d5a8636c85d27a007cd8d6f1e