use File::Temp ();
use Fcntl qw(SEEK_SET O_CREAT O_EXCL O_WRONLY);
use Carp qw(croak);
-use POSIX qw(WNOHANG);
+our %LIVE;
sub _wq_done_wait { # dwaitpid callback (via wq_eof)
my ($arg, $pid) = @_;
my ($n) = (m!/([0-9]+)\z!);
$n => [ URI->new($_), '' ]
} @v2_urls; # uniq
- return clone_v2($self, \%v2_epochs);
+ clone_v2($self, \%v2_epochs);
+ reap_live() while keys(%LIVE);
+ return;
}
# filter out common URLs served by WWW (e.g /$MSGID/T/)
$ft->unlink_on_destroy(0);
}
-sub _get_txt { # non-fatal
+sub _get_txt_start { # non-fatal
my ($self, $endpoint, $file, $mode) = @_;
my $uri = URI->new($self->{cur_src} // $self->{src});
my $lei = $self->{lei};
my $opt = { 0 => $lei->{0}, 1 => $lei->{1}, 2 => $lei->{2} };
my $cmd = $self->{curl}->for_uri($lei, $uri,
qw(--compressed -R -o), $ft->filename);
- my $cerr = run_reap($lei, $cmd, $opt);
+ $self->{-get_txt} = [ $ft, $cmd, $uri, $file, $mode ];
+ $lei->qerr("# @$cmd");
+ spawn($cmd, undef, $opt);
+}
+
+sub _get_txt_done {
+ my ($self) = @_;
+ my ($ft, $cmd, $uri, $file, $mode) = @{delete $self->{-get_txt}};
+ my $cerr = $?;
+ $? = 0;
return "$uri missing" if ($cerr >> 8) == 22;
return "# @$cmd failed (non-fatal)" if $cerr;
+ my $dst = $self->{cur_dst} // $self->{dst};
ft_rename($ft, "$dst/$file", $mode);
undef; # success
}
# tries the relatively new /$INBOX/_/text/config/raw endpoint
-sub _try_config {
+sub _try_config_start {
my ($self) = @_;
my $dst = $self->{cur_dst} // $self->{dst};
if (!-d $dst || !mkdir($dst)) {
File::Path::mkpath($dst);
-d $dst or die "mkpath($dst): $!\n";
}
- my $err = _get_txt($self,
- qw(_/text/config/raw inbox.config.example), 0444);
+ _get_txt_start($self, qw(_/text/config/raw inbox.config.example), 0444);
+}
+
+sub _try_config_done {
+ my ($self) = @_;
+ my $err = _get_txt_done($self);
return warn($err, "\n") if $err;
+ my $dst = $self->{cur_dst} // $self->{dst};
my $f = "$dst/inbox.config.example";
my $cfg = PublicInbox::Config->git_config_dump($f, $self->{lei}->{2});
my $ibx = $self->{ibx} = {};
}
}
+sub _get_txt { # non-fatal temporary compat function
+ waitpid(_get_txt_start(@_), 0) > 0 or die "waitpid: $!";
+ _get_txt_done($_[0]);
+}
+
+# tries the relatively new /$INBOX/_/text/config/raw endpoint
+sub _try_config { # temporary compat function
+ waitpid(_try_config_start($_[0]), 0) > 0 or die "waitpid: $!";
+ _try_config_done($_[0]);
+}
+
sub set_description ($) {
my ($self) = @_;
my $dst = $self->{cur_dst} // $self->{dst};
}
sub reap_clone { # async, called via SIGCHLD
- my ($lei, $cmd, $live) = @_;
+ my ($lei, $cmd) = @_;
my $cerr = $?;
$? = 0; # don't let it influence normal exit
if ($cerr) {
- kill('TERM', keys %$live);
+ kill('TERM', keys %LIVE);
$lei->child_error($cerr, "@$cmd failed");
}
}
+sub v2_done { # called via OnDestroy
+ my ($self) = @_;
+ require PublicInbox::MultiGit;
+ my $dst = $self->{cur_dst} // $self->{dst};
+ my $mg = PublicInbox::MultiGit->new($dst, 'all.git', 'git');
+ $mg->fill_alternates;
+ for my $i ($mg->git_epochs) { $mg->epoch_cfg_set($i) }
+ for my $edst (@{delete($self->{-read_only}) // []}) {
+ my @st = stat($edst) or die "stat($edst): $!";
+ chmod($st[2] & 0555, $edst) or die "chmod(a-w, $edst): $!";
+ }
+ write_makefile($dst, 2);
+ delete $self->{-locked} // die "BUG: $dst not locked"; # unlock
+ index_cloned_inbox($self, 2);
+}
+
+sub reap_live {
+ my $pid = waitpid(-1, 0) // die "waitpid(-1): $!";
+ if (my $x = delete $LIVE{$pid}) {
+ my $cb = shift @$x;
+ $cb->(@$x);
+ } else {
+ warn "reaped unknown PID=$pid ($?)\n";
+ }
+}
+
sub clone_v2 ($$;$) {
my ($self, $v2_epochs, $m) = @_; # $m => manifest.js.gz hashref
my $lei = $self->{lei};
my $pfx = $curl->torsocks($lei, $first_uri) or return;
my $dst = $self->{cur_dst} // $self->{dst};
my $want = parse_epochs($lei->{opt}->{epoch}, $v2_epochs);
- my (@src_edst, @read_only, @skip);
+ my $task = $m ? bless { %$self }, __PACKAGE__ : $self;
+ my (@src_edst, @skip);
for my $nr (sort { $a <=> $b } keys %$v2_epochs) {
my ($uri, $key) = @{$v2_epochs->{$nr}};
my $src = $uri->as_string;
push @src_edst, $src, $edst;
} else { # create a placeholder so users only need to chmod +w
init_placeholder($src, $edst);
- push @read_only, $edst;
+ push @{$task->{-read_only}}, $edst;
push @skip, $key;
}
}
# filter out the epochs we skipped
$self->{-culled_manifest} = 1 if delete(@$m{@skip});
my $lk = bless { lock_path => "$dst/inbox.lock" }, 'PublicInbox::Lock';
- my $task = $m ? bless { %$self }, __PACKAGE__ : $self;
-
- _try_config($task);
- my $on_destroy = $lk->lock_for_scope($$);
+ my $fini = PublicInbox::OnDestroy->new($$, \&v2_done, $task);
+ $LIVE{_try_config_start($task)} = [ \&_try_config_done, $task, $fini ];
+ $task->{-locked} = $lk->lock_for_scope($$);
my @cmd = clone_cmd($lei, my $opt = {});
my $jobs = $self->{lei}->{opt}->{jobs} // 2;
- my %live;
- my $sigchld = sub {
- my ($sig) = @_;
- my $flags = $sig ? WNOHANG : 0;
- while (1) {
- my $pid = waitpid(-1, $flags) or return;
- return if $pid < 0;
- if (my $x = delete $live{$pid}) {
- my $cb = shift @$x;
- $cb->(@$x, \%live);
- } else {
- warn "reaped unknown PID=$pid ($?)\n";
- }
- }
- };
do {
- $sigchld->(0) while keys(%live) >= $jobs;
- local $SIG{CHLD} = $sigchld;
- while (keys(%live) < $jobs && @src_edst &&
+ reap_live() while keys(%LIVE) >= $jobs;
+ while (keys(%LIVE) < $jobs && @src_edst &&
!$lei->{child_error}) {
my $cmd = [ @$pfx, @cmd, splice(@src_edst, 0, 2) ];
$lei->qerr("# @$cmd");
- my $pid = spawn($cmd, undef, $opt);
- $live{$pid} = [ \&reap_clone, $lei, $cmd ];
+ $LIVE{spawn($cmd, undef, $opt)} = [ \&reap_clone,
+ $lei, $cmd, $fini ];
}
} while (@src_edst && !$lei->{child_error});
- $sigchld->(0) while keys(%live);
- return if $lei->{child_error};
-
- require PublicInbox::MultiGit;
- my $mg = PublicInbox::MultiGit->new($dst, 'all.git', 'git');
- $mg->fill_alternates;
- for my $i ($mg->git_epochs) { $mg->epoch_cfg_set($i) }
- for my $edst (@read_only) {
- my @st = stat($edst) or die "stat($edst): $!";
- chmod($st[2] & 0555, $edst) or die "chmod(a-w, $edst): $!";
- }
- write_makefile($dst, 2);
- undef $on_destroy; # unlock
- index_cloned_inbox($task, 2);
}
sub decode_manifest ($$$) {
my $opt = { -C => $pdir };
$opt->{$_} = $lei->{$_} for (0..2);
my $cerr = run_reap($lei, $cmd, $opt);
+ local %LIVE;
if ($cerr) {
return try_scrape($self) if ($cerr >> 8) == 22; # 404 missing
return $lei->child_error($cerr, "@$cmd failed");
}
my ($path_pfx, $n, $multi) = multi_inbox($self, \$path, $m);
return $lei->child_error(1, $multi) if !ref($multi);
+ my $jobs = $self->{lei}->{opt}->{jobs} // 2;
if (my $v2 = delete $multi->{v2}) {
for my $name (sort keys %$v2) {
my $epochs = delete $v2->{$name};
E: `$self->{cur_dst}' must not contain newline
EOM
clone_v2($self, \%v2_epochs, $m);
+ reap_live() while keys(%LIVE) >= $jobs;
+ return if $self->{lei}->{child_error};
}
}
if (my $v1 = delete $multi->{v1}) {
clone_v1($self, 1);
}
}
+ reap_live() while keys(%LIVE);
if (delete $self->{-culled_manifest}) { # set by clone_v2/-I/--exclude
# write the smaller manifest if epochs were skipped so
# users won't have to delete manifest if they +w an
eval {
my $iv = $lei->{opt}->{'inbox-version'};
if (defined $iv) {
+ local %LIVE;
return clone_v1($self) if $iv == 1;
return try_scrape($self) if $iv == 2;
die "bad --inbox-version=$iv\n";