* [PATCH] wwwlisting: utf8::decode before undef
@ 2020-05-31 23:09 5% Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-05-31 23:09 UTC (permalink / raw)
To: meta
Assisted by commit a73957b5b05f2a00f7a85353b1658b6d8cde05ae
("testcommon: speed up wait_for_tail() on GNU/Linux")
Fixes: 846161e3d1207d59 ("treat $INBOX_DIR/description and gitweb.owner as UTF-8")
---
lib/PublicInbox/WwwListing.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index a416d24f0e4..a3d4e2b3566 100644
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -157,10 +157,10 @@ sub manifest_add ($$;$$) {
chomp(my $owner = $git->qx('config', 'gitweb.owner'));
chomp(my $desc = try_cat("$git_dir/description"));
+ utf8::decode($owner);
+ utf8::decode($desc);
$owner = undef if $owner eq '';
$desc = 'Unnamed repository' if $desc eq '';
- utf8::decode($desc);
- utf8::decode($owner);
# templates/hooks--update.sample and git-multimail in git.git
# only match "Unnamed repository", not the full contents of
^ permalink raw reply related [relevance 5%]
* [PATCH] testcommon: speed up wait_for_tail() on GNU/Linux
@ 2020-05-30 8:51 7% Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-05-30 8:51 UTC (permalink / raw)
To: meta
Somewhat recent versions of GNU tail(1) use inotify(7) on Linux;
so don't penalize hackers using TAIL='tail -F' to run their tests
with extra delays.
Ironically, we still need to busy loop on /proc/$TAIL_PID/{fd,fdinfo}
since inotify doesn't seem to support procfs.
---
lib/PublicInbox/TestCommon.pm | 43 +++++++++++++++++++++++++++++++----
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 79e597f5..246047b1 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -5,6 +5,7 @@
package PublicInbox::TestCommon;
use strict;
use parent qw(Exporter);
+use v5.10.1;
use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD :seek);
use POSIX qw(dup2);
use IO::Socket::INET;
@@ -249,7 +250,39 @@ sub run_script ($;$$) {
$? == 0;
}
-sub wait_for_tail () { sleep(2) }
+sub tick (;$) {
+ my $tick = shift // 0.1;
+ select undef, undef, undef, $tick;
+ 1;
+}
+
+sub wait_for_tail ($;$) {
+ my ($tail_pid, $stop) = @_;
+ my $wait = 2;
+ if ($^O eq 'linux') { # GNU tail may use inotify
+ state $tail_has_inotify;
+ return tick if $stop && $tail_has_inotify;
+ my $end = time + $wait;
+ my @ino;
+ do {
+ @ino = grep {
+ readlink($_) =~ /\binotify\b/
+ } glob("/proc/$tail_pid/fd/*");
+ } while (!@ino && time <= $end and tick);
+ return if !@ino;
+ $tail_has_inotify = 1;
+ $ino[0] =~ s!/fd/!/fdinfo/!;
+ my @info;
+ do {
+ if (open my $fh, '<', $ino[0]) {
+ local $/ = "\n";
+ @info = grep(/^inotify wd:/, <$fh>);
+ }
+ } while (scalar(@info) < 2 && time <= $end and tick);
+ } else {
+ sleep($wait);
+ }
+}
# like system() built-in, but uses spawn() for env/rdr + vfork
sub xsys {
@@ -294,7 +327,7 @@ sub start_script {
exec(split(' ', $tail_cmd), @paths);
die "$tail_cmd failed: $!";
}
- wait_for_tail();
+ wait_for_tail($tail_pid);
}
}
defined(my $pid = fork) or die "fork: $!\n";
@@ -359,9 +392,9 @@ sub join {
sub DESTROY {
my ($self) = @_;
return if $self->{owner} != $$;
- if (my $tail = delete $self->{tail_pid}) {
- PublicInbox::TestCommon::wait_for_tail();
- CORE::kill('TERM', $tail);
+ if (my $tail_pid = delete $self->{tail_pid}) {
+ PublicInbox::TestCommon::wait_for_tail($tail_pid, 1);
+ CORE::kill('TERM', $tail_pid);
}
$self->join('TERM');
}
^ permalink raw reply related [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-05-30 8:51 7% [PATCH] testcommon: speed up wait_for_tail() on GNU/Linux Eric Wong
2020-05-31 23:09 5% [PATCH] wwwlisting: utf8::decode before undef Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).