fetch-pack: progressively use larger handshake windows

gitster · gitster · commit 6afca450c3f2 · 2011-03-20T21:53:25.000-07:00
The client has to dig the history deeper when more recent parts of its
history do not have any overlap with the server it is fetching from. Make
the handshake window exponentially larger as we dig deeper, with a
reasonable upper cap.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
Acked-by: Shawn Pearce &lt;spearce@spearce.org&gt;
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
@@ -219,10 +219,15 @@ static void send_request(int fd, struct strbuf *buf)
 }
 
 #define INITIAL_FLUSH 32
+#define LARGE_FLUSH 1024
 
 static int next_flush(int count)
 {
-	return INITIAL_FLUSH + count;
+	if (count < LARGE_FLUSH)
+		count <<= 1;
+	else
+		count += LARGE_FLUSH;
+	return count;
 }
 
 static int find_common(int fd[2], unsigned char *result_sha1,

Original file line number	Diff line number	Diff line change
`@@ -219,10 +219,15 @@ static void send_request(int fd, struct strbuf *buf)`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`#define INITIAL_FLUSH 32`
	`222`	`+#define LARGE_FLUSH 1024`
`222`	`223`
`223`	`224`	`static int next_flush(int count)`
`224`	`225`	`{`
`225`		`- return INITIAL_FLUSH + count;`
	`226`	`+ if (count < LARGE_FLUSH)`
	`227`	`+ count <<= 1;`
	`228`	`+ else`
	`229`	`+ count += LARGE_FLUSH;`
	`230`	`+ return count;`
`226`	`231`	`}`
`227`	`232`
`228`	`233`	`static int find_common(int fd[2], unsigned char *result_sha1,`