user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 6/8] git: signal-safety for pipe writes
Date: Fri, 25 Sep 2015 02:27:55 +0000	[thread overview]
Message-ID: <20150925022757.6915-7-e@80x24.org> (raw)
In-Reply-To: <20150925022757.6915-1-e@80x24.org>

I've yet to hit it, but syswrite has chance of returning EINTR
on a blocking pipe.
---
 lib/PublicInbox/GitCatFile.pm | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/PublicInbox/GitCatFile.pm b/lib/PublicInbox/GitCatFile.pm
index 48ae673..3fced28 100644
--- a/lib/PublicInbox/GitCatFile.pm
+++ b/lib/PublicInbox/GitCatFile.pm
@@ -7,6 +7,7 @@ package PublicInbox::GitCatFile;
 use strict;
 use warnings;
 use POSIX qw(dup2);
+require IO::Handle;
 
 sub new {
 	my ($class, $git_dir) = @_;
@@ -31,6 +32,7 @@ sub _cat_file_begin {
 	}
 	close $out_r or die "close failed: $!\n";
 	close $in_w or die "close failed: $!\n";
+	$out_w->autoflush(1);
 
 	$self->{in} = $in_r;
 	$self->{out} = $out_w;
@@ -40,16 +42,8 @@ sub _cat_file_begin {
 sub cat_file {
 	my ($self, $object, $sizeref) = @_;
 
-	$object .= "\n";
-	my $len = length($object);
-
 	$self->_cat_file_begin;
-	my $written = syswrite($self->{out}, $object);
-	if (!defined $written) {
-		die "pipe write error: $!\n";
-	} elsif ($written != $len) {
-		die "wrote too little to pipe ($written < $len)\n";
-	}
+	print { $self->{out} } $object, "\n" or die "pipe write error: $!\n";
 
 	my $in = $self->{in};
 	my $head = <$in>;
-- 
EW


  parent reply	other threads:[~2015-09-25  2:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-25  2:27 [PATCH 0/8] nntp: more fixes and tiny speedups Eric Wong
2015-09-25  2:27 ` [PATCH 1/8] nntp: HDR allows metadata prefixed with ':' Eric Wong
2015-09-25  2:27 ` [PATCH 2/8] nntp: consistently use 501 for unsupported LIST Eric Wong
2015-09-25  2:27 ` [PATCH 3/8] searchidx: remove unused sub: next_doc_id Eric Wong
2015-09-25  2:27 ` [PATCH 4/8] nntp: do not repeat result on blocked write Eric Wong
2015-09-25  2:27 ` [PATCH 5/8] nntp: prefix FD on every log line Eric Wong
2015-09-25  2:27 ` Eric Wong [this message]
2015-09-25  2:27 ` [PATCH 7/8] git: use fields for GitCatFile Eric Wong
2015-09-25  2:27 ` [PATCH 8/8] nntp: avoid signals for long responses Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150925022757.6915-7-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).