diff options
author | barkalow@iabervon.org <barkalow@iabervon.org> | 2005-08-02 19:46:29 -0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-02 22:53:11 -0700 |
commit | 70b9829ea73931f7e2f23fbe5f1853e0dca5ca12 (patch) | |
tree | c740201e802d9723eb0d1606e778dbaab438bf2e /sha1_file.c | |
parent | 1e8be59d14f36128e5eb12cc0457e676bb79690c (diff) | |
download | git-70b9829ea73931f7e2f23fbe5f1853e0dca5ca12.tar.gz |
[PATCH] Parallelize pulling by ssh
This causes ssh-pull to request objects in prefetch() and read then in
fetch(), such that it reduces the unpipelined round-trip time.
This also makes sha1_write_from_fd() support having a buffer of data
which it accidentally read from the fd after the object; this was
formerly not a problem, because it would always get a short read at
the end of an object, because the next object had not been
requested. This is no longer true.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'sha1_file.c')
-rw-r--r-- | sha1_file.c | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/sha1_file.c b/sha1_file.c index e808c91316..df5eb2ac67 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1389,14 +1389,14 @@ int write_sha1_to_fd(int fd, const unsigned char *sha1) return 0; } -int write_sha1_from_fd(const unsigned char *sha1, int fd) +int write_sha1_from_fd(const unsigned char *sha1, int fd, char *buffer, + size_t bufsize, size_t *bufposn) { char *filename = sha1_file_name(sha1); int local; z_stream stream; unsigned char real_sha1[20]; - unsigned char buf[4096]; unsigned char discard[4096]; int ret; SHA_CTX c; @@ -1414,7 +1414,24 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd) do { ssize_t size; - size = read(fd, buf, 4096); + if (*bufposn) { + stream.avail_in = *bufposn; + stream.next_in = buffer; + do { + stream.next_out = discard; + stream.avail_out = sizeof(discard); + ret = inflate(&stream, Z_SYNC_FLUSH); + SHA1_Update(&c, discard, sizeof(discard) - + stream.avail_out); + } while (stream.avail_in && ret == Z_OK); + write(local, buffer, *bufposn - stream.avail_in); + memmove(buffer, buffer + *bufposn - stream.avail_in, + stream.avail_in); + *bufposn = stream.avail_in; + if (ret != Z_OK) + break; + } + size = read(fd, buffer + *bufposn, bufsize - *bufposn); if (size <= 0) { close(local); unlink(filename); @@ -1423,18 +1440,8 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd) perror("Reading from connection"); return -1; } - write(local, buf, size); - stream.avail_in = size; - stream.next_in = buf; - do { - stream.next_out = discard; - stream.avail_out = sizeof(discard); - ret = inflate(&stream, Z_SYNC_FLUSH); - SHA1_Update(&c, discard, sizeof(discard) - - stream.avail_out); - } while (stream.avail_in && ret == Z_OK); - - } while (ret == Z_OK); + *bufposn += size; + } while (1); inflateEnd(&stream); close(local); |