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

parallel: Fixed: --bin blocks with -j100%.

Browse source
This commit is contained in:
Ole Tange 2022-02-19 19:53:50 +01:00
parent 6b13c5d928
commit 961ad63bdc
1 changed files with 51 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
src/parallel
View file

@ -512,7 +512,8 @@ sub pipe_shard_setup() {
my @parcatfifos; my @parcatfifos;
# TODO $opt::jobs should be evaluated (100%) # TODO $opt::jobs should be evaluated (100%)
# TODO $opt::jobs should be number of total_jobs if there are argugemts # TODO $opt::jobs should be number of total_jobs if there are argugemts
my $njobs = $opt::jobs; max_jobs_running();
my $njobs = $Global::max_jobs_running;
for my $m (0..$njobs-1) { for my $m (0..$njobs-1) {
for my $n (0..$njobs-1) { for my $n (0..$njobs-1) {
# sharding to A B C D # sharding to A B C D
@ -1564,9 +1565,9 @@ sub options_hash() {
"X" => \$opt::X, "X" => \$opt::X,
"v" => \@opt::v, "v" => \@opt::v,
"sql=s" => \$opt::retired, "sql=s" => \$opt::retired,
"sqlmaster=s" => \$opt::sqlmaster, "sql-master|sqlmaster=s" => \$opt::sqlmaster,
"sqlworker=s" => \$opt::sqlworker, "sql-worker|sqlworker=s" => \$opt::sqlworker,
"sqlandworker=s" => \$opt::sqlandworker, "sql-and-worker|sqlandworker=s" => \$opt::sqlandworker,
"joblog|jl=s" => \$opt::joblog, "joblog|jl=s" => \$opt::joblog,
"results|result|res=s" => \$opt::results, "results|result|res=s" => \$opt::results,
"resume" => \$opt::resume, "resume" => \$opt::resume,
@ -1578,10 +1579,10 @@ sub options_hash() {
"group" => \$opt::group, "group" => \$opt::group,
"g" => \$opt::retired, "g" => \$opt::retired,
"ungroup|u" => \$opt::ungroup, "ungroup|u" => \$opt::ungroup,
"linebuffer|linebuffered|line-buffer|line-buffered|lb" "line-buffer|line-buffered|linebuffer|linebuffered|lb"
=> \$opt::linebuffer, => \$opt::linebuffer,
"tmux" => \$opt::tmux, "tmux" => \$opt::tmux,
"tmuxpane" => \$opt::tmuxpane, "tmux-pane|tmuxpane" => \$opt::tmuxpane,
"null|0" => \$opt::null, "null|0" => \$opt::null,
"quote|q" => \$opt::quote, "quote|q" => \$opt::quote,
# Replacement strings # Replacement strings
@ -1601,22 +1602,24 @@ sub options_hash() {
"sshdelay=f" => \$opt::sshdelay, "sshdelay=f" => \$opt::sshdelay,
"load=s" => \$opt::load, "load=s" => \$opt::load,
"noswap" => \$opt::noswap, "noswap" => \$opt::noswap,
"max-line-length-allowed" => \$opt::max_line_length_allowed, "max-line-length-allowed|maxlinelengthallowed"
"number-of-cpus" => \$opt::number_of_cpus, => \$opt::max_line_length_allowed,
"number-of-sockets" => \$opt::number_of_sockets, "number-of-cpus|numberofcpus" => \$opt::number_of_cpus,
"number-of-cores" => \$opt::number_of_cores, "number-of-sockets|numberofsockets" => \$opt::number_of_sockets,
"number-of-threads" => \$opt::number_of_threads, "number-of-cores|numberofcores" => \$opt::number_of_cores,
"use-sockets-instead-of-threads" "number-of-threads|numberofthreads" => \$opt::number_of_threads,
"use-sockets-instead-of-threads|usesocketsinsteadofthreads"
=> \$opt::use_sockets_instead_of_threads, => \$opt::use_sockets_instead_of_threads,
"use-cores-instead-of-threads" "use-cores-instead-of-threads|usecoresinsteadofthreads"
=> \$opt::use_cores_instead_of_threads, => \$opt::use_cores_instead_of_threads,
"use-cpus-instead-of-cores" => \$opt::use_cpus_instead_of_cores, "use-cpus-instead-of-cores|usecpusinsteadofcores"
"shellquote|shell_quote|shell-quote" => \@opt::shellquote, => \$opt::use_cpus_instead_of_cores,
"shell-quote|shellquote|shell_quote" => \@opt::shellquote,
"nice=i" => \$opt::nice, "nice=i" => \$opt::nice,
"tag" => \$opt::tag, "tag" => \$opt::tag,
"tagstring|tag-string=s" => \$opt::tagstring, "tag-string|tagstring=s" => \$opt::tagstring,
"ctag" => \$opt::ctag, "ctag" => \$opt::ctag,
"ctagstring|ctag-string=s" => \$opt::ctagstring, "ctag-string|ctagstring=s" => \$opt::ctagstring,
"onall" => \$opt::onall, "onall" => \$opt::onall,
"nonall" => \$opt::nonall, "nonall" => \$opt::nonall,
"filter-hosts|filterhosts|filter-host" => \$opt::filter_hosts, "filter-hosts|filterhosts|filter-host" => \$opt::filter_hosts,
@ -1633,14 +1636,16 @@ sub options_hash() {
"basefile|bf=s" => \@opt::basefile, "basefile|bf=s" => \@opt::basefile,
"template|tmpl=s" => \%opt::template, "template|tmpl=s" => \%opt::template,
"B=s" => \$opt::retired, "B=s" => \$opt::retired,
"ctrlc|ctrl-c" => \$opt::retired, "ctrl-c|ctrlc" => \$opt::retired,
"noctrlc|no-ctrlc|no-ctrl-c" => \$opt::retired, "no-ctrl-c|no-ctrlc|noctrlc" => \$opt::retired,
"workdir|work-dir|wd=s" => \$opt::workdir, "work-dir|workdir|wd=s" => \$opt::workdir,
"W=s" => \$opt::retired, "W=s" => \$opt::retired,
"rsync-opts|rsyncopts=s" => \$opt::rsync_opts, "rsync-opts|rsyncopts=s" => \$opt::rsync_opts,
"tmpdir|tempdir=s" => \$opt::tmpdir, "tmpdir|tempdir=s" => \$opt::tmpdir,
"use-compress-program|compress-program=s" => \$opt::compress_program, "use-compress-program|compress-program|".
"use-decompress-program|decompress-program=s" "usecompressprogram|compressprogram=s" => \$opt::compress_program,
"use-decompress-program|decompress-program|".
"usedecompressprogram|decompressprogram=s"
=> \$opt::decompress_program, => \$opt::decompress_program,
"compress" => \$opt::compress, "compress" => \$opt::compress,
"tty" => \$opt::tty, "tty" => \$opt::tty,
@ -1669,69 +1674,72 @@ sub options_hash() {
# You accept to be put in a public hall of shame by removing # You accept to be put in a public hall of shame by removing
# these lines. # these lines.
"bibtex|citation" => \$opt::citation, "bibtex|citation" => \$opt::citation,
"wc|willcite|will-cite|nn|nonotice|no-notice" => \$opt::willcite, "will-cite|willcite|nn|nonotice|no-notice" => \$opt::willcite,
# Termination and retries # Termination and retries
"halt-on-error|halt=s" => \$opt::halt, "halt-on-error|haltonerror|halt=s" => \$opt::halt,
"limit=s" => \$opt::limit, "limit=s" => \$opt::limit,
"memfree=s" => \$opt::memfree, "memfree=s" => \$opt::memfree,
"memsuspend=s" => \$opt::memsuspend, "memsuspend=s" => \$opt::memsuspend,
"retries=s" => \$opt::retries, "retries=s" => \$opt::retries,
"timeout=s" => \$opt::timeout, "timeout=s" => \$opt::timeout,
"termseq|term-seq=s" => \$opt::termseq, "term-seq|termseq=s" => \$opt::termseq,
# xargs-compatibility - implemented, man, testsuite # xargs-compatibility - implemented, man, testsuite
"max-procs|P=s" => \$opt::jobs, "max-procs|maxprocs|P=s" => \$opt::jobs,
"delimiter|d=s" => \$opt::d, "delimiter|d=s" => \$opt::d,
"max-chars|s=s" => \$opt::max_chars, "max-chars|maxchars|s=s" => \$opt::max_chars,
"arg-file|a=s" => \@opt::a, "arg-file|arg-file|a=s" => \@opt::a,
"no-run-if-empty|r" => \$opt::r, "no-run-if-empty|norunifempty|r" => \$opt::r,
"replace|i:s" => \$opt::i, "replace|i:s" => \$opt::i,
"E=s" => \$opt::eof, "E=s" => \$opt::eof,
"eof|e:s" => \$opt::eof, "eof|e:s" => \$opt::eof,
"max-args|maxargs|n=s" => \$opt::max_args, "max-args|maxargs|n=s" => \$opt::max_args,
"max-replace-args|N=s" => \$opt::max_replace_args, "max-replace-args|maxreplaceargs|N=s"
"colsep|col-sep|C=s" => \$opt::colsep, => \$opt::max_replace_args,
"col-sep|colsep|C=s" => \$opt::colsep,
"csv"=> \$opt::csv, "csv"=> \$opt::csv,
"help|h" => \$opt::help, "help|h" => \$opt::help,
"L=s" => \$opt::L, "L=s" => \$opt::L,
"max-lines|l:f" => \$opt::max_lines, "max-lines|maxlines|l:f" => \$opt::max_lines,
"interactive|p" => \$opt::interactive, "interactive|p" => \$opt::interactive,
"verbose|t" => \$opt::verbose, "verbose|t" => \$opt::verbose,
"version|V" => \$opt::version, "version|V" => \$opt::version,
"minversion|min-version=i" => \$opt::minversion, "min-version|minversion=i" => \$opt::minversion,
"show-limits|showlimits" => \$opt::show_limits, "show-limits|showlimits" => \$opt::show_limits,
"exit|x" => \$opt::x, "exit|x" => \$opt::x,
# Semaphore # Semaphore
"semaphore" => \$opt::semaphore, "semaphore" => \$opt::semaphore,
"semaphoretimeout|st=s" => \$opt::semaphoretimeout, "semaphore-timeout|semaphoretimeout|st=s"
"semaphorename|id=s" => \$opt::semaphorename, => \$opt::semaphoretimeout,
"semaphore-name|semaphorename|id=s" => \$opt::semaphorename,
"fg" => \$opt::fg, "fg" => \$opt::fg,
"bg" => \$opt::bg, "bg" => \$opt::bg,
"wait" => \$opt::wait, "wait" => \$opt::wait,
# Shebang #!/usr/bin/parallel --shebang # Shebang #!/usr/bin/parallel --shebang
"shebang|hashbang" => \$opt::shebang, "shebang|hashbang" => \$opt::shebang,
"internal-pipe-means-argfiles" "internal-pipe-means-argfiles|internalpipemeansargfiles"
=> \$opt::internal_pipe_means_argfiles, => \$opt::internal_pipe_means_argfiles,
"Y" => \$opt::retired, "Y" => \$opt::retired,
"skip-first-line" => \$opt::skip_first_line, "skip-first-line|skipfirstline"
=> \$opt::skip_first_line,
"bug" => \$opt::bug, "bug" => \$opt::bug,
# --pipe # --pipe
"pipe|spreadstdin" => \$opt::pipe, "pipe|spreadstdin" => \$opt::pipe,
"robin|round-robin|roundrobin" => \$opt::roundrobin, "round-robin|roundrobin|round" => \$opt::roundrobin,
"recstart=s" => \$opt::recstart, "recstart=s" => \$opt::recstart,
"recend=s" => \$opt::recend, "recend=s" => \$opt::recend,
"regexp|regex" => \$opt::regexp, "regexp|regex" => \$opt::regexp,
"remove-rec-sep|removerecsep|rrs" => \$opt::remove_rec_sep, "remove-rec-sep|removerecsep|rrs" => \$opt::remove_rec_sep,
"files|output-as-files|outputasfiles" => \$opt::files, "output-as-files|outputasfiles|files" => \$opt::files,
"block|block-size|blocksize=s" => \$opt::blocksize, "block-size|blocksize|block=s" => \$opt::blocksize,
"blocktimeout|block-timeout|bt=s" => \$opt::blocktimeout, "block-timeout|blocktimeout|bt=s" => \$opt::blocktimeout,
"header=s" => \$opt::header, "header=s" => \$opt::header,
"cat" => \$opt::cat, "cat" => \$opt::cat,
"fifo" => \$opt::fifo, "fifo" => \$opt::fifo,
"pipepart|pipe-part" => \$opt::pipepart, "pipe-part|pipepart" => \$opt::pipepart,
"tee" => \$opt::tee, "tee" => \$opt::tee,
"shard=s" => \$opt::shard, "shard=s" => \$opt::shard,
"bin=s" => \$opt::bin, "bin=s" => \$opt::bin,
"groupby|group-by=s" => \$opt::groupby, "group-by|groupby=s" => \$opt::groupby,
# #
"hgrp|hostgrp|hostgroup|hostgroups" => \$opt::hostgroups, "hgrp|hostgrp|hostgroup|hostgroups" => \$opt::hostgroups,
"embed" => \$opt::embed, "embed" => \$opt::embed,