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

parallel: Fixed bug #36585: Ctrl-C should propagate to remote.

Browse source
This commit is contained in:
Ole Tange 2012-06-03 22:33:00 +02:00
parent 541bde1838
commit 1a98839ca4
7 changed files with 37 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/niceload.pod
View file

@ -245,12 +245,12 @@ Copyright (C) 2004-11-19 Ole Tange, http://ole.tange.dk
Copyright (C) 2005,2006,2006,2008,2009,2010 Ole Tange, http://ole.tange.dk Copyright (C) 2005,2006,2006,2008,2009,2010 Ole Tange, http://ole.tange.dk
Copyright (C) 2010,2011 Ole Tange, http://ole.tange.dk and Free Copyright (C) 2010,2011,2012 Ole Tange, http://ole.tange.dk and Free
Software Foundation, Inc. Software Foundation, Inc.
=head1 LICENSE =head1 LICENSE
Copyright (C) 2010 Free Software Foundation, Inc. Copyright (C) 2010,2011,2012 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

4
src/niceload.texi
View file

@ -284,13 +284,13 @@ Copyright (C) 2004-11-19 Ole Tange, http://ole.tange.dk
Copyright (C) 2005,2006,2006,2008,2009,2010 Ole Tange, http://ole.tange.dk Copyright (C) 2005,2006,2006,2008,2009,2010 Ole Tange, http://ole.tange.dk
Copyright (C) 2010,2011 Ole Tange, http://ole.tange.dk and Free Copyright (C) 2010,2011,2012 Ole Tange, http://ole.tange.dk and Free
Software Foundation, Inc. Software Foundation, Inc.
@chapter LICENSE @chapter LICENSE
@anchor{LICENSE} @anchor{LICENSE}
Copyright (C) 2010 Free Software Foundation, Inc. Copyright (C) 2010,2011,2012 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

17
src/parallel
View file

@ -40,6 +40,7 @@ if(not $ENV{SHELL}) {
} }
%Global::original_sig = %SIG; %Global::original_sig = %SIG;
$SIG{TERM} = sub {}; # Dummy until jobs really start $SIG{TERM} = sub {}; # Dummy until jobs really start
$SIG{INT} = \&sigint;
open $Global::original_stderr, ">&STDERR" or ::die_bug("Can't dup STDERR: $!"); open $Global::original_stderr, ">&STDERR" or ::die_bug("Can't dup STDERR: $!");
parse_options(); parse_options();
@ -566,7 +567,7 @@ sub get_options_from_array {
sub parse_options { sub parse_options {
# Returns: N/A # Returns: N/A
# Defaults: # Defaults:
$Global::version = 20120528; $Global::version = 20120602;
$Global::progname = 'parallel'; $Global::progname = 'parallel';
$Global::infinity = 2**31; $Global::infinity = 2**31;
$Global::debug = 0; $Global::debug = 0;
@ -1748,6 +1749,12 @@ sub timeout {
} }
} }
} }
sub sigint {
$Global::start_no_new_jobs = 1;
}
sub __USAGE__ {} sub __USAGE__ {}
sub wait_and_exit { sub wait_and_exit {
@ -2924,7 +2931,7 @@ sub sshcommand_of_sshlogin {
} }
} }
} else { } else {
$sshcmd = "ssh"; $serverlogin = $self->{'string'}; $sshcmd = "ssh -t -t -o LogLevel=quiet"; $serverlogin = $self->{'string'};
} }
} }
$self->{'sshcommand'} = $sshcmd; $self->{'sshcommand'} = $sshcmd;
@ -3606,8 +3613,10 @@ sub start {
$pid = ::open3($in, ">&OUT", ">&ERR", $ENV{SHELL}, "-c", $command) || $pid = ::open3($in, ">&OUT", ">&ERR", $ENV{SHELL}, "-c", $command) ||
::die_bug("open3-pipe"); ::die_bug("open3-pipe");
$job->set_stdin($in); $job->set_stdin($in);
} elsif(@::opt_a and not $Global::stdin_in_opt_a and $job->seq() == 1) { } elsif(@::opt_a and not $Global::stdin_in_opt_a and $job->seq() == 1
# Give STDIN to the first job if using -a and $job->sshlogin()->string() eq ":") {
# Give STDIN to the first job if using -a (but only if running
# locally - otherwise CTRL-C does not work for other jobs Bug#36585)
*IN = *STDIN; *IN = *STDIN;
$pid = ::open3("<&IN", ">&OUT", ">&ERR", $ENV{SHELL}, "-c", $command) || $pid = ::open3("<&IN", ">&OUT", ">&ERR", $ENV{SHELL}, "-c", $command) ||
::die_bug("open3-a"); ::die_bug("open3-a");

8
src/parallel.pod
View file

@ -2186,7 +2186,7 @@ complete.
Run 10 jobs concurrently in the background: Run 10 jobs concurrently in the background:
for i in `ls *.log` ; do for i in *.log ; do
echo $i echo $i
sem -j10 gzip $i ";" echo done sem -j10 gzip $i ";" echo done
done done
@ -2288,7 +2288,7 @@ If you have a dir in which users drop files that needs to be processed
you can do this on GNU/Linux (If you know what B<inotifywait> is you can do this on GNU/Linux (If you know what B<inotifywait> is
called on other platforms file a bug report): called on other platforms file a bug report):
B<inotifywait -q -m -r -e CLOSE_WRITE --format %w%f my_dir | parallel B<inotifywait -q -m -r -e MOVED_TO -e CLOSE_WRITE --format %w%f my_dir | parallel
-u echo> -u echo>
This will run the command B<echo> on each file put into B<my_dir> or This will run the command B<echo> on each file put into B<my_dir> or
@ -2300,8 +2300,8 @@ proves to be a problem, file a bug report.
You can of course use B<-S> to distribute the jobs to remote You can of course use B<-S> to distribute the jobs to remote
computers: computers:
B<inotifywait -q -m -r -e CLOSE_WRITE --format %w%f my_dir | parallel -S .. B<inotifywait -q -m -r -e MOVED_TO -e CLOSE_WRITE --format %w%f my_dir
-u echo> | parallel -S .. -u echo>
If the files to be processed are in a tar file then unpacking one file If the files to be processed are in a tar file then unpacking one file
and processing it immediately may be faster than first unpacking all and processing it immediately may be faster than first unpacking all

24
src/parallel.texi
View file

@ -576,7 +576,7 @@ use @strong{-I} instead.
Logfile for executed jobs. Save a list of the executed jobs to Logfile for executed jobs. Save a list of the executed jobs to
@emph{logfile} in the following TAB separated format: sequence number, @emph{logfile} in the following TAB separated format: sequence number,
sshlogin, start time as seconds since epoch, run time in seconds, sshlogin, start time as seconds since epoch, run time in seconds,
bytes in files transfered, bytes in files returned, exit status, bytes in files transferred, bytes in files returned, exit status,
and command run. and command run.
To convert the times into ISO-8601 strict do: To convert the times into ISO-8601 strict do:
@ -1653,7 +1653,7 @@ solution is to quote the whole command:
@strong{parallel "zcat @{@} }>@strong{@{.@}" ::: *.gz} @strong{parallel "zcat @{@} }>@strong{@{.@}" ::: *.gz}
Other special shell charaters (such as * ; $ > < | >> <<) also need Other special shell characters (such as * ; $ > < | >> <<) also need
to be put in quotes, as they may otherwise be interpreted by the shell to be put in quotes, as they may otherwise be interpreted by the shell
and not given to GNU @strong{parallel}. and not given to GNU @strong{parallel}.
@ -1685,7 +1685,7 @@ symlinks are empty files.
@strong{cp -rs /the/source/dir mirror_dir; find mirror_dir -type l | parallel -m rm @{@} '&&' touch @{@}} @strong{cp -rs /the/source/dir mirror_dir; find mirror_dir -type l | parallel -m rm @{@} '&&' touch @{@}}
Find the files in a list that do no exist. Find the files in a list that do not exist
@strong{cat file_list | parallel 'if [ ! -e @{@} ] ; then echo @{@}; fi'} @strong{cat file_list | parallel 'if [ ! -e @{@} ] ; then echo @{@}; fi'}
@ -2351,7 +2351,7 @@ complete.
Run 10 jobs concurrently in the background: Run 10 jobs concurrently in the background:
@verbatim @verbatim
for i in `ls *.log` ; do for i in *.log ; do
echo $i echo $i
sem -j10 gzip $i ";" echo done sem -j10 gzip $i ";" echo done
done done
@ -2459,7 +2459,7 @@ If you have a dir in which users drop files that needs to be processed
you can do this on GNU/Linux (If you know what @strong{inotifywait} is you can do this on GNU/Linux (If you know what @strong{inotifywait} is
called on other platforms file a bug report): called on other platforms file a bug report):
@strong{inotifywait -q -m -r -e CLOSE_WRITE --format %w%f my_dir | parallel @strong{inotifywait -q -m -r -e MOVED_TO -e CLOSE_WRITE --format %w%f my_dir | parallel
-u echo} -u echo}
This will run the command @strong{echo} on each file put into @strong{my_dir} or This will run the command @strong{echo} on each file put into @strong{my_dir} or
@ -2471,8 +2471,8 @@ proves to be a problem, file a bug report.
You can of course use @strong{-S} to distribute the jobs to remote You can of course use @strong{-S} to distribute the jobs to remote
computers: computers:
@strong{inotifywait -q -m -r -e CLOSE_WRITE --format %w%f my_dir | parallel -S .. @strong{inotifywait -q -m -r -e MOVED_TO -e CLOSE_WRITE --format %w%f my_dir
-u echo} | parallel -S .. -u echo}
If the files to be processed are in a tar file then unpacking one file If the files to be processed are in a tar file then unpacking one file
and processing it immediately may be faster than first unpacking all and processing it immediately may be faster than first unpacking all
@ -2615,7 +2615,7 @@ GNU @strong{parallel} will then print the currently running jobs on stderr
@anchor{COMPLETE RUNNING JOBS BUT DO NOT START NEW JOBS} @anchor{COMPLETE RUNNING JOBS BUT DO NOT START NEW JOBS}
If you regret starting a lot of jobs you can simply break GNU @strong{parallel}, If you regret starting a lot of jobs you can simply break GNU @strong{parallel},
but if you want to make sure you do not have halfcompleted jobs you but if you want to make sure you do not have half-completed jobs you
should send the signal @strong{SIGTERM} to GNU @strong{parallel}: should send the signal @strong{SIGTERM} to GNU @strong{parallel}:
@strong{killall -TERM parallel} @strong{killall -TERM parallel}
@ -2768,7 +2768,7 @@ If @strong{--halt-on-error} 1 or 2: Exit status of the failing job.
There are a lot programs with some of the functionality of GNU There are a lot programs with some of the functionality of GNU
@strong{parallel}. GNU @strong{parallel} strives to include the best of the @strong{parallel}. GNU @strong{parallel} strives to include the best of the
functionality without sacrifying ease of use. functionality without sacrificing ease of use.
@section SUMMARY TABLE @section SUMMARY TABLE
@anchor{SUMMARY TABLE} @anchor{SUMMARY TABLE}
@ -2817,7 +2817,7 @@ Remote execution
R6. No config files needed R6. No config files needed
R7. Do not run more than SSHD's MaxStartup can handle R7. Do not run more than SSHD's MaxStartup can handle
R8. Configurable SSH command R8. Configurable SSH command
R9. Retry if connection breaks occationally R9. Retry if connection breaks occasionally
Semaphore Semaphore
S1. Possibility to work as a mutex S1. Possibility to work as a mutex
@ -2904,7 +2904,7 @@ supports (See REPORTING BUGS).
@section DIFFERENCES BETWEEN xargs AND GNU Parallel @section DIFFERENCES BETWEEN xargs AND GNU Parallel
@anchor{DIFFERENCES BETWEEN xargs AND GNU Parallel} @anchor{DIFFERENCES BETWEEN xargs AND GNU Parallel}
@strong{xargs} offer some of the same possibilites as GNU @strong{parallel}. @strong{xargs} offer some of the same possibilities as GNU @strong{parallel}.
@strong{xargs} deals badly with special characters (such as space, ' and @strong{xargs} deals badly with special characters (such as space, ' and
"). To see the problem try this: "). To see the problem try this:
@ -2980,7 +2980,7 @@ becomes (assuming you have 8 cores)
@section DIFFERENCES BETWEEN find -exec AND GNU Parallel @section DIFFERENCES BETWEEN find -exec AND GNU Parallel
@anchor{DIFFERENCES BETWEEN find -exec AND GNU Parallel} @anchor{DIFFERENCES BETWEEN find -exec AND GNU Parallel}
@strong{find -exec} offer some of the same possibilites as GNU @strong{parallel}. @strong{find -exec} offer some of the same possibilities as GNU @strong{parallel}.
@strong{find -exec} only works on files. So processing other input (such as @strong{find -exec} only works on files. So processing other input (such as
hosts or URLs) will require creating these inputs as files. @strong{find hosts or URLs) will require creating these inputs as files. @strong{find

4
src/sem.pod
View file

@ -178,13 +178,13 @@ Report bugs to <bug-parallel@gnu.org>.
=head1 AUTHOR =head1 AUTHOR
Copyright (C) 2010,2011 Ole Tange, http://ole.tange.dk and Free Copyright (C) 2010,2011,2012 Ole Tange, http://ole.tange.dk and Free
Software Foundation, Inc. Software Foundation, Inc.
=head1 LICENSE =head1 LICENSE
Copyright (C) 2010,2011 Free Software Foundation, Inc. Copyright (C) 2010,2011,2012 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

4
src/sem.texi
View file

@ -214,13 +214,13 @@ Report bugs to <bug-parallel@@gnu.org>.
@chapter AUTHOR @chapter AUTHOR
@anchor{AUTHOR} @anchor{AUTHOR}
Copyright (C) 2010,2011 Ole Tange, http://ole.tange.dk and Free Copyright (C) 2010,2011,2012 Ole Tange, http://ole.tange.dk and Free
Software Foundation, Inc. Software Foundation, Inc.
@chapter LICENSE @chapter LICENSE
@anchor{LICENSE} @anchor{LICENSE}
Copyright (C) 2010,2011 Free Software Foundation, Inc. Copyright (C) 2010,2011,2012 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by