On Wednesday 20 April 2005 13:06, Linus Torvalds wrote:
> On Wed, 20 Apr 2005, Chris Mason wrote:
> > At any rate, the time for a single write-tree is pretty consistent.
> > Before it was around .5 seconds, and with this change it goes down to
> > .128s.
>
> Oh, wow.
>
> I bet your SHA1 implementation is done with hand-optimized and scheduled
> x86 MMX code or something, while my poor G5 is probably using some slow
> generic routine. As a result, it only improved by 33% for me since the
> compression was just part of the picture, but with your cheap SHA1 the
> compression costs really dominated, and so it's almost four times faster
> for you.
Aha, I was wondering why your write-tree speeds sounded so bad...this athlon
machine is ~2years old now.
Your comments about costs for writing the index file got me thinking, so I
benchmarked how long the update-cache takes if we don't do the sha1 of the
index file. There was almost no difference at all. update-cache currently
takes about .152 seconds
The code to write the cache calls write() for every cache entry, writing just
a few bytes at a time. I changed it to collect these into a 16k buffer,
which brings me down to .044s. This might not help as much on ext23, since
they are faster than reiser for tiny writes.
The patch below with your current tree brings my 100 patch test down to 22
seconds again.
-chris
--- linus.back/read-cache.c 2005-04-20 10:14:23.268310000 -0400
+++ linus/read-cache.c 2005-04-20 13:05:13.200083672 -0400
@@ -232,11 +232,12 @@
SHA_CTX c;
struct cache_header hdr;
int i;
+ char *buf;
+ int len = 0;
hdr.hdr_signature = htonl(CACHE_SIGNATURE);
hdr.hdr_version = htonl(1);
hdr.hdr_entries = htonl(entries);
-
SHA1_Init(&c);
SHA1_Update(&c, &hdr, offsetof(struct cache_header, sha1));
for (i = 0; i < entries; i++) {
@@ -246,13 +247,31 @@
}
SHA1_Final(hdr.sha1, &c);
+ buf = malloc(16384);
+ if (!buf) {
+ return -1;
+ }
if (write(newfd, &hdr, sizeof(hdr)) != sizeof(hdr))
return -1;
for (i = 0; i < entries; i++) {
struct cache_entry *ce = cache[i];
int size = ce_size(ce);
- if (write(newfd, ce, size) != size)
+ if (size > 16384) {
+ if (write(newfd, ce, size) != size)
+ return -1;
+ continue;
+ }
+ if (len + size > 16384) {
+ if (write(newfd, buf, len) != len)
+ return -1;
+ len = 0;
+ }
+ memcpy(buf + len, ce, size);
+ len += size;
+ }
+ if (len) {
+ if (write(newfd, buf, len) != len)
return -1;
}
return 0;
