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

Fixed bug #43600: --pipe --linebuffer --round does not work.

Browse source
This commit is contained in:
Ole Tange 2014-11-13 17:03:36 +01:00
parent 2fb56b5755
commit 1dd2d6a601
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/parallel
View file

@ -483,6 +483,7 @@ sub round_robin_write {
my ($header_ref,$block_ref,$recstart,$recend,$endpos) = @_; my ($header_ref,$block_ref,$recstart,$recend,$endpos) = @_;
my $something_written = 0; my $something_written = 0;
my $block_passed = 0; my $block_passed = 0;
my $sleep = 1;
while(not $block_passed) { while(not $block_passed) {
# Continue flushing existing buffers # Continue flushing existing buffers
# until one is empty and a new block is passed # until one is empty and a new block is passed
@ -497,6 +498,7 @@ sub round_robin_write {
last; last;
} }
} }
$sleep = ::reap_usleep($sleep);
} }
start_more_jobs(); start_more_jobs();
return $something_written; return $something_written;

3
testsuite/tests-to-run/parallel-local23.sh
View file

@ -31,6 +31,9 @@ echo
echo '### test round-robin'; echo '### test round-robin';
nice seq 1000 | $NICEPAR --block 1k --pipe --round-robin wc | sort nice seq 1000 | $NICEPAR --block 1k --pipe --round-robin wc | sort
echo '### bug #43600: --pipe --linebuffer --round does not work'
seq 10000000000 | parallel --pipe --linebuffer --round cat | head
echo '### --version must have higher priority than retired options' echo '### --version must have higher priority than retired options'
$NICEPAR --version -g -Y -U -W -T | tail $NICEPAR --version -g -Y -U -W -T | tail

13
testsuite/wanted-results/parallel-local23
View file

@ -50,6 +50,19 @@ echo '### test round-robin'; nice seq 1000 | $NICEPAR --block 1k --pipe --roun
250 250 1000 250 250 1000
250 250 1000 250 250 1000
277 277 1000 277 277 1000
echo '### bug #43600: --pipe --linebuffer --round does not work'
### bug #43600: --pipe --linebuffer --round does not work
seq 10000000000 | parallel --pipe --linebuffer --round cat | head
1
2
3
4
5
6
7
8
9
10
echo '### --version must have higher priority than retired options' echo '### --version must have higher priority than retired options'
### --version must have higher priority than retired options ### --version must have higher priority than retired options
$NICEPAR --version -g -Y -U -W -T | tail $NICEPAR --version -g -Y -U -W -T | tail