tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-21 21:47:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: Fix 2 of bug #57364: Race condition creating len cache file.

Browse source 
parallel: New sysread loop of --pipe broken on perl 5.14 (32-bit issue).
This commit is contained in:
Ole Tange 2020-01-22 17:33:53 +01:00
parent fc97f4f61b
commit 033dd3df91
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/parallel
View file

@ -964,10 +964,18 @@ sub spreadstdin() {
local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required
# --blocktimeout (or 0 if not set) # --blocktimeout (or 0 if not set)
alarm $timeout; alarm $timeout;
do { if($] >= 5.026) {
$nread = sysread $in, $buf, $readsize, length $buf; do {
$readsize -= $nread; $nread = sysread $in, $buf, $readsize, length $buf;
} while($readsize and $nread); $readsize -= $nread;
} while($readsize and $nread);
} else {
# Less efficient reading, but 32-bit sysread compatible
do {
$nread = sysread($in,substr($buf,length $buf,0),$readsize,0);
$readsize -= $nread;
} while($readsize and $nread);
}
alarm 0; alarm 0;
}; };
if ($@) { if ($@) {
@ -2138,7 +2146,7 @@ sub check_invalid_option_combinations() {
sub init_globals() { sub init_globals() {
# Defaults: # Defaults:
$Global::version = 20191223; $Global::version = 20200122;
$Global::progname = 'parallel'; $Global::progname = 'parallel';
$::name = "GNU Parallel"; $::name = "GNU Parallel";
$Global::infinity = 2**31; $Global::infinity = 2**31;
@ -11361,14 +11369,16 @@ sub max_length($) {
open(my $fh, "<", $len_cache) || ::die_bug("Cannot read $len_cache"); open(my $fh, "<", $len_cache) || ::die_bug("Cannot read $len_cache");
$cached_limit = <$fh>; $cached_limit = <$fh>;
close $fh; close $fh;
} else { }
if(not $cached_limit) {
$cached_limit = real_max_length(); $cached_limit = real_max_length();
# If $HOME is write protected: Do not fail # If $HOME is write protected: Do not fail
my $dir = ::dirname($len_cache); my $dir = ::dirname($len_cache);
-d $dir or eval { File::Path::mkpath($dir); }; -d $dir or eval { File::Path::mkpath($dir); };
open(my $fh, ">", $len_cache); open(my $fh, ">", $len_cache.$$);
print $fh $cached_limit; print $fh $cached_limit;
close $fh; close $fh;
rename $len_cache.$$, $len_cache || ::die_bug("rename cache file");
} }
$Limits::Command::line_max_len = tmux_length($cached_limit); $Limits::Command::line_max_len = tmux_length($cached_limit);
if($opt::max_chars) { if($opt::max_chars) {