mirror of
https://git.savannah.gnu.org/git/parallel.git
synced 2024-12-22 12:47:54 +00:00
parallel: added exit Signal to --joblog
This commit is contained in:
Ole Tange
parent
f28cda7a19
commit
780f000c92
20
configure
vendored
20
configure
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.68 for parallel 20110522.
|
||||
# Generated by GNU Autoconf 2.68 for parallel 20110607.
|
||||
#
|
||||
# Report bugs to <bug-parallel@gnu.org>.
|
||||
#
|
||||
|
|
@ -559,8 +559,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='parallel'
|
||||
PACKAGE_TARNAME='parallel'
|
||||
PACKAGE_VERSION='20110522'
|
||||
PACKAGE_STRING='parallel 20110522'
|
||||
PACKAGE_VERSION='20110607'
|
||||
PACKAGE_STRING='parallel 20110607'
|
||||
PACKAGE_BUGREPORT='bug-parallel@gnu.org'
|
||||
PACKAGE_URL=''
|
||||
|
||||
|
|
@ -1176,7 +1176,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures parallel 20110522 to adapt to many kinds of systems.
|
||||
\`configure' configures parallel 20110607 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1242,7 +1242,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of parallel 20110522:";;
|
||||
short | recursive ) echo "Configuration of parallel 20110607:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1309,7 +1309,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
parallel configure 20110522
|
||||
parallel configure 20110607
|
||||
generated by GNU Autoconf 2.68
|
||||
|
||||
Copyright (C) 2010 Free Software Foundation, Inc.
|
||||
|
|
@ -1326,7 +1326,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by parallel $as_me 20110522, which was
|
||||
It was created by parallel $as_me 20110607, which was
|
||||
generated by GNU Autoconf 2.68. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -2141,7 +2141,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='parallel'
|
||||
VERSION='20110522'
|
||||
VERSION='20110607'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -2704,7 +2704,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by parallel $as_me 20110522, which was
|
||||
This file was extended by parallel $as_me 20110607, which was
|
||||
generated by GNU Autoconf 2.68. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -2766,7 +2766,7 @@ _ACEOF
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
parallel config.status 20110522
|
||||
parallel config.status 20110607
|
||||
configured by $0, generated by GNU Autoconf 2.68,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
AC_INIT([parallel], [20110522], [bug-parallel@gnu.org])
|
||||
AC_INIT([parallel], [20110607], [bug-parallel@gnu.org])
|
||||
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_FILES([
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
niceload seeks last column:
|
||||
|
||||
iostat -x 1 2
|
||||
|
||||
niceload --start-condition
|
||||
|
||||
|
||||
Til QUOTING:
|
||||
|
||||
FN="two spaces"
|
||||
|
|
@ -90,6 +97,17 @@ Postkort:
|
|||
- Eet eksempel: parallel gzip ::: *
|
||||
- Link til video. http://nd.gd/0s
|
||||
|
||||
Til inspiration.
|
||||
|
||||
Hvis du stadig er ved at lave post- eller visitkort ting, så kunne du evt tilføje en QR code. Med MECARD tagget kan flere tags gemmes i en og samme fil:
|
||||
|
||||
qrencode -l L -o x.png "MECARD:N:GNU Parallel;EMAIL:parallel@gnu.org;URL:gnu.org/software/parallel;"
|
||||
|
||||
Den ser OK ud i en Androide tlf.
|
||||
|
||||
Husk at skrive indholdet under billedet, det er irreterende at skulle gætte.
|
||||
|
||||
|
||||
GNU parallel is a UNIX-tool for running commands in parallel.
|
||||
To gzip all files running one job per CPU write:
|
||||
parallel gzip ::: *
|
||||
|
|
|
|||
|
|
@ -68,9 +68,9 @@ size with 1024, 1048576, 1073741824, or 1099511627776 respectively.
|
|||
Sets niceness. See B<nice>(1).
|
||||
|
||||
|
||||
=item B<-N> I<niceness>
|
||||
=item B<-N>
|
||||
|
||||
=item B<--noswap> I<niceness>
|
||||
=item B<--noswap>
|
||||
|
||||
Do not start new jobs on a given computer if there is both swap-in and
|
||||
swap-out activity.
|
||||
|
|
@ -296,7 +296,7 @@ B<parallel>(1), B<nice>(1)
|
|||
use strict;
|
||||
use Getopt::Long;
|
||||
$Global::progname="niceload";
|
||||
$Global::version = 20110526;
|
||||
$Global::version = 20110607;
|
||||
Getopt::Long::Configure("bundling","require_order");
|
||||
get_options_from_array(\@ARGV) || die_usage();
|
||||
if($::opt_version) {
|
||||
|
|
|
|||
19
src/parallel
19
src/parallel
|
|
@ -445,7 +445,7 @@ sub get_options_from_array {
|
|||
sub parse_options {
|
||||
# Returns: N/A
|
||||
# Defaults:
|
||||
$Global::version = 20110526;
|
||||
$Global::version = 20110607;
|
||||
$Global::progname = 'parallel';
|
||||
$Global::infinity = 2**31;
|
||||
$Global::debug = 0;
|
||||
|
|
@ -639,7 +639,7 @@ sub parse_options {
|
|||
} else {
|
||||
print $Global::joblog
|
||||
join("\t", "Seq", "Host", "Starttime", "Runtime",
|
||||
"Send", "Receive", "Exitval", "Command"
|
||||
"Send", "Receive", "Exitval", "Signal", "Command"
|
||||
). "\n";
|
||||
}
|
||||
}
|
||||
|
|
@ -1538,6 +1538,7 @@ sub reaper {
|
|||
my $job = $Global::running{$stiff};
|
||||
$job or next;
|
||||
$job->set_exitstatus($? >> 8);
|
||||
$job->set_exitsignal($? & 127);
|
||||
debug("died (".$job->exitstatus()."): ".$job->seq());
|
||||
$job->set_endtime();
|
||||
if($stiff == $Global::tty_taken) {
|
||||
|
|
@ -2656,6 +2657,7 @@ sub new {
|
|||
# The commandline wrapped with rsync and ssh
|
||||
'sshlogin_wrap' => undef,
|
||||
'exitstatus' => undef,
|
||||
'exitsignal' => undef,
|
||||
}, ref($class) || $class;
|
||||
}
|
||||
|
||||
|
|
@ -3225,7 +3227,7 @@ sub print {
|
|||
join("\t", $self->seq(), $self->sshlogin()->string(),
|
||||
$self->starttime(), $self->runtime(),
|
||||
$self->transfersize(), $self->returnsize(),
|
||||
$self->exitstatus(), $cmd
|
||||
$self->exitstatus(), $self->exitsignal(), $cmd
|
||||
). "\n";
|
||||
flush $Global::joblog;
|
||||
}
|
||||
|
|
@ -3279,6 +3281,17 @@ sub set_exitstatus {
|
|||
$self->{'exitstatus'} = $exitstatus;
|
||||
}
|
||||
|
||||
sub exitsignal {
|
||||
my $self = shift;
|
||||
return $self->{'exitsignal'};
|
||||
}
|
||||
|
||||
sub set_exitsignal {
|
||||
my $self = shift;
|
||||
my $exitsignal = shift;
|
||||
$self->{'exitsignal'} = $exitsignal;
|
||||
}
|
||||
|
||||
|
||||
package CommandLine;
|
||||
|
||||
|
|
|
|||
|
|
@ -737,7 +737,7 @@ This will set the owner of the homedir to the user:
|
|||
|
||||
B<tr ':' '\012' < /etc/passwd | parallel -N7 chown {1} {6}>
|
||||
|
||||
Implies B<-X> unless B<-m> or <--pipe> is set.
|
||||
Implies B<-X> unless B<-m> or B<--pipe> is set.
|
||||
|
||||
When used with B<--pipe> B<-N> is the number of records to read. This
|
||||
is much slower than B<--blocksize> so avoid it if performance is
|
||||
|
|
|
|||
2
src/sql
2
src/sql
|
|
@ -536,7 +536,7 @@ $Global::Initfile && unlink $Global::Initfile;
|
|||
exit ($err);
|
||||
|
||||
sub parse_options {
|
||||
$Global::version = 20110526;
|
||||
$Global::version = 20110607;
|
||||
$Global::progname = 'sql';
|
||||
|
||||
# This must be done first as this may exec myself
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
### Test -k
|
||||
parallel: Warning: Only enough filehandles to run 20 jobs in parallel. Raising ulimit -n may help
|
||||
parallel: Warning: Only enough filehandles to run 20 jobs in parallel. Raising ulimit -n may help.
|
||||
begin
|
||||
1
|
||||
2
|
||||
|
|
@ -72,3 +72,4 @@ parallel: sleep 3; echo 17
|
|||
parallel: sleep 3; echo 18
|
||||
### Test bug: empty line for | sh with -k
|
||||
a
|
||||
b
|
||||
|
|
|
|||
Loading…
Reference in a new issue