unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/3] use pipe for git-http-backend output
Date: Thu, 25 Feb 2016 04:02:35 +0000	[thread overview]
Message-ID: <20160225040237.29014-2-e@80x24.org> (raw)
In-Reply-To: <20160225040237.29014-1-e@80x24.org>

This allows us to stream the output to the client without buffering
everything up-front.  Next, we'll let Danga::Socket (or AE in the
future) wait for readability.
---
 lib/PublicInbox/GitHTTPBackend.pm | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 562c290..cba025e 100644
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -132,9 +132,9 @@ sub serve_smart {
 	my $buf;
 	my $in;
 	my $err = $env->{'psgi.errors'};
-	if (fileno($input) >= 0) { # FIXME untested
+	if (fileno($input) >= 0) {
 		$in = $input;
-	} else {
+	} else { # FIXME untested
 		$in = IO::File->new_tmpfile;
 		while (1) {
 			my $r = $input->read($buf, 8192);
@@ -148,7 +148,11 @@ sub serve_smart {
 		$in->flush;
 		$in->sysseek(0, SEEK_SET);
 	}
-	my $out = IO::File->new_tmpfile;
+	my ($rpipe, $wpipe);
+	unless (pipe($rpipe, $wpipe)) {
+		$err->print('error creating pipe', $!, "\n");
+		return r(500);
+	}
 	my $pid = fork; # TODO: vfork under Linux...
 	unless (defined $pid) {
 		$err->print('error forking: ', $!, "\n");
@@ -170,22 +174,17 @@ sub serve_smart {
 		$ENV{GIT_HTTP_EXPORT_ALL} = '1';
 		$ENV{PATH_TRANSLATED} = "$git->{git_dir}/$path";
 		dup2(fileno($in), 0) or die "redirect stdin failed: $!\n";
-		dup2(fileno($out), 1) or die "redirect stdout failed: $!\n";
+		dup2(fileno($wpipe), 1) or die "redirect stdout failed: $!\n";
 		my @cmd = qw(git http-backend);
 		exec(@cmd) or die 'exec `' . join(' ', @cmd). "' failed: $!\n";
 	}
-
-	if (waitpid($pid, 0) != $pid) {
-		$err->print("git http-backend ($git->{git_dir}): ", $?, "\n");
-		return r(500);
-	}
+	$wpipe = undef;
 	$in = undef;
-	$out->seek(0, SEEK_SET);
 	my @h;
 	my $code = 200;
 	{
 		local $/ = "\r\n";
-		while (defined(my $line = <$out>)) {
+		while (defined(my $line = <$rpipe>)) {
 			if ($line =~ /\AStatus:\s*(\d+)/) {
 				$code = $1;
 			} else {
@@ -200,7 +199,7 @@ sub serve_smart {
 		my ($cb) = @_;
 		my $fh = $cb->([ $code, \@h ]);
 		while (1) {
-			my $r = $out->read($buf, 8192);
+			my $r = sysread($rpipe, $buf, 8192);
 			die "$!\n" unless defined $r;
 			last if ($r == 0);
 			$fh->write($buf);
-- 
EW


  reply	other threads:[~2016-02-25  4:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-25  4:02 [PATCH 0/3] migrate git-http-backend to async use Eric Wong
2016-02-25  4:02 ` Eric Wong [this message]
2016-02-25  4:02 ` [PATCH 2/3] git-http-backend: start refactoring to use callback Eric Wong
2016-02-25  4:02 ` [PATCH 3/3] git-http-backend: start async API for streaming Eric Wong
2016-02-25  4:30   ` [PATCH v2] " Eric Wong
2016-02-25  4:39 ` [PATCH 4/3] git-http-backend: avoid multi-arg print statemtents 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=20160225040237.29014-2-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.
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).