From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 12/12] receive-pack: send keepalives during quiet periods
Date: Fri, 15 Jul 2016 12:18:38 -0700 [thread overview]
Message-ID: <xmqq7fcmn20h.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160715104347.GL19271@sigill.intra.peff.net> (Jeff King's message of "Fri, 15 Jul 2016 06:43:47 -0400")
Jeff King <peff@peff.net> writes:
> diff --git a/builtin/index-pack.c b/builtin/index-pack.c
> index 1cba120..54f2cfb 100644
> --- a/builtin/index-pack.c
> +++ b/builtin/index-pack.c
> @@ -1626,6 +1626,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
> struct pack_idx_option opts;
> unsigned char pack_sha1[20];
> unsigned foreign_nr = 1; /* zero is a "good" value, assume bad */
> + int report_end_of_input = 0;
>
> if (argc == 2 && !strcmp(argv[1], "-h"))
> usage(index_pack_usage);
> @@ -1697,6 +1698,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
> verbose = 1;
> } else if (!strcmp(arg, "--show-resolving-progress")) {
> show_resolving_progress = 1;
> + } else if (!strcmp(arg, "--report-end-of-input")) {
> + report_end_of_input = 1;
> } else if (!strcmp(arg, "-o")) {
> if (index_name || (i+1) >= argc)
> usage(index_pack_usage);
> @@ -1754,6 +1757,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
> obj_stat = xcalloc(st_add(nr_objects, 1), sizeof(struct object_stat));
> ofs_deltas = xcalloc(nr_objects, sizeof(struct ofs_delta_entry));
> parse_pack_objects(pack_sha1);
> + if (report_end_of_input)
> + write_in_full(2, "\0", 1);
> resolve_deltas();
> conclude_pack(fix_thin_pack, curr_pack, pack_sha1);
> free(ofs_deltas);
I naively thought "well, if we are teaching index-pack a new trick
anyway, why not make it do the keepalive?", but that would not work
because a keepalive is a 0-byte payload on band#1, i.e. "0005\1",
and index-pack is not aware of the sideband framing at all.
So I agree that a-nul-in-fd#2 is the best mechansim we can make it
work.
Thanks.
prev parent reply other threads:[~2016-07-15 19:18 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 10:25 [PATCH 0/12] push progress reporting and keepalives Jeff King
2016-07-15 10:26 ` [PATCH 01/12] check_everything_connected: always pass --quiet to rev-list Jeff King
2016-07-15 10:28 ` [PATCH 02/12] rev-list: add optional progress reporting Jeff King
2016-07-15 18:00 ` Junio C Hamano
2016-07-16 1:23 ` Jeff King
2016-07-15 10:28 ` [PATCH 03/12] check_everything_connected: convert to argv_array Jeff King
2016-07-15 10:30 ` [PATCH 04/12] check_everything_connected: use a struct with named options Jeff King
2016-07-15 18:13 ` Junio C Hamano
2016-07-16 1:24 ` Jeff King
2016-07-15 10:32 ` [PATCH 05/12] check_connected: relay errors to alternate descriptor Jeff King
2016-07-15 18:19 ` Junio C Hamano
2016-07-16 1:27 ` Jeff King
2016-07-15 10:32 ` [PATCH 06/12] check_connected: add progress flag Jeff King
2016-07-15 10:33 ` [PATCH 07/12] clone: use a real progress meter for connectivity check Jeff King
2016-07-15 10:34 ` [PATCH 08/12] index-pack: add flag for showing delta-resolution progress Jeff King
2016-07-15 10:35 ` [PATCH 09/12] receive-pack: turn on index-pack resolving progress Jeff King
2016-07-15 10:36 ` [PATCH 10/12] receive-pack: relay connectivity errors to sideband Jeff King
2016-07-15 10:36 ` [PATCH 11/12] receive-pack: turn on connectivity progress Jeff King
2016-07-15 10:43 ` [PATCH 12/12] receive-pack: send keepalives during quiet periods Jeff King
2016-07-15 17:24 ` Stefan Beller
2016-07-16 7:56 ` Jeff King
2016-07-19 5:28 ` Stefan Beller
2016-07-19 10:07 ` Jeff King
2016-07-19 16:05 ` Stefan Beller
2016-07-20 13:28 ` Jeff King
2016-07-15 19:18 ` Junio C Hamano [this message]
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7fcmn20h.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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/mirrors/git.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).