fetch-pack: factor out hardcoded handshake window size

The "git fetch" client presents the most recent 32 commits it has to the
server and gives a chance to the server to say "ok, we heard enough", and
continues reporting what it has in chunks of 32 commits, digging its
history down to older commits.

Move the hardcoded size of the handshake window outside the code, so that
we can tweak it more easily.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Shawn Pearce <spearce@spearce.org>

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 59fbda522b7ba0ce4308aa85fac1a7b1b51c1550..1abe624dc8a850f63dfc814950c1aadab97e5fbb 100644 (file)
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -218,11 +218,18 @@ static void send_request(int fd, struct strbuf *buf)
                safe_write(fd, buf->buf, buf->len);
 }
 
                safe_write(fd, buf->buf, buf->len);
 }
 

+#define INITIAL_FLUSH 32
+
+static int next_flush(int count)
+{
+       return INITIAL_FLUSH + count;
+}
+

 static int find_common(int fd[2], unsigned char *result_sha1,
                       struct ref *refs)
 {
        int fetching;
 static int find_common(int fd[2], unsigned char *result_sha1,
                       struct ref *refs)
 {
        int fetching;

-       int count = 0, flushes = 0, retval;
+       int count = 0, flushes = 0, flush_at = INITIAL_FLUSH, retval;

        const unsigned char *sha1;
        unsigned in_vain = 0;
        int got_continue = 0;
        const unsigned char *sha1;
        unsigned in_vain = 0;
        int got_continue = 0;


@@ -335,19 +342,20 @@ static int find_common(int fd[2], unsigned char *result_sha1,
                if (args.verbose)
                        fprintf(stderr, "have %s\n", sha1_to_hex(sha1));
                in_vain++;
                if (args.verbose)
                        fprintf(stderr, "have %s\n", sha1_to_hex(sha1));
                in_vain++;

-               if (!(31 & ++count)) {
+               if (flush_at <= ++count) {

                        int ack;
 
                        packet_buf_flush(&req_buf);
                        send_request(fd[1], &req_buf);
                        strbuf_setlen(&req_buf, state_len);
                        flushes++;
                        int ack;
 
                        packet_buf_flush(&req_buf);
                        send_request(fd[1], &req_buf);
                        strbuf_setlen(&req_buf, state_len);
                        flushes++;

+                       flush_at = next_flush(count);

 
                        /*
                         * We keep one window "ahead" of the other side, and
                         * will wait for an ACK only on the next one
                         */
 
                        /*
                         * We keep one window "ahead" of the other side, and
                         * will wait for an ACK only on the next one
                         */

-                       if (!args.stateless_rpc && count == 32)
+                       if (!args.stateless_rpc && count == INITIAL_FLUSH)

                                continue;
 
                        consume_shallow_list(fd[0]);
                                continue;
 
                        consume_shallow_list(fd[0]);