X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=csum-file.c;h=9728a9954129246b96713d2f3b8dbd52541c416b;hb=3e3d4ee7cb7726dcf799f95d27bce384c32b2c8a;hp=9ab997120d04c5be0aa9d3ff3ba090ba12b7bec8;hpb=237ce836e770e8ead12a14ee4a8170009fa4a40b;p=git.git diff --git a/csum-file.c b/csum-file.c index 9ab997120..717d29fc0 100644 --- a/csum-file.c +++ b/csum-file.c @@ -8,15 +8,16 @@ * able to verify hasn't been messed with afterwards. */ #include "cache.h" +#include "progress.h" #include "csum-file.h" -static void sha1flush(struct sha1file *f, unsigned int count) +static void sha1flush(struct sha1file *f, void *buf, unsigned int count) { - void *buf = f->buffer; - for (;;) { int ret = xwrite(f->fd, buf, count); if (ret > 0) { + f->total += ret; + display_throughput(f->tp, f->total); buf = (char *) buf + ret; count -= ret; if (count) @@ -29,43 +30,60 @@ static void sha1flush(struct sha1file *f, unsigned int count) } } -int sha1close(struct sha1file *f, unsigned char *result, int final) +int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags) { + int fd; unsigned offset = f->offset; + if (offset) { - SHA1_Update(&f->ctx, f->buffer, offset); - sha1flush(f, offset); + git_SHA1_Update(&f->ctx, f->buffer, offset); + sha1flush(f, f->buffer, offset); f->offset = 0; } - if (!final) - return 0; /* only want to flush (no checksum write, no close) */ - SHA1_Final(f->buffer, &f->ctx); + git_SHA1_Final(f->buffer, &f->ctx); if (result) hashcpy(result, f->buffer); - sha1flush(f, 20); - if (close(f->fd)) - die("%s: sha1 file error on close (%s)", f->name, strerror(errno)); + if (flags & (CSUM_CLOSE | CSUM_FSYNC)) { + /* write checksum and close fd */ + sha1flush(f, f->buffer, 20); + if (flags & CSUM_FSYNC) + fsync_or_die(f->fd, f->name); + if (close(f->fd)) + die("%s: sha1 file error on close (%s)", + f->name, strerror(errno)); + fd = 0; + } else + fd = f->fd; free(f); - return 0; + return fd; } int sha1write(struct sha1file *f, void *buf, unsigned int count) { - if (f->do_crc) - f->crc32 = crc32(f->crc32, buf, count); while (count) { unsigned offset = f->offset; unsigned left = sizeof(f->buffer) - offset; unsigned nr = count > left ? left : count; + void *data; + + if (f->do_crc) + f->crc32 = crc32(f->crc32, buf, nr); + + if (nr == sizeof(f->buffer)) { + /* process full buffer directly without copy */ + data = buf; + } else { + memcpy(f->buffer + offset, buf, nr); + data = f->buffer; + } - memcpy(f->buffer + offset, buf, nr); count -= nr; offset += nr; buf = (char *) buf + nr; left -= nr; if (!left) { - SHA1_Update(&f->ctx, f->buffer, offset); - sha1flush(f, offset); + git_SHA1_Update(&f->ctx, data, offset); + sha1flush(f, data, offset); offset = 0; } f->offset = offset; @@ -75,22 +93,19 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count) struct sha1file *sha1fd(int fd, const char *name) { - struct sha1file *f; - unsigned len; - - f = xmalloc(sizeof(*f)); - - len = strlen(name); - if (len >= PATH_MAX) - die("you wascally wabbit, you"); - f->namelen = len; - memcpy(f->name, name, len+1); + return sha1fd_throughput(fd, name, NULL); +} +struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp) +{ + struct sha1file *f = xmalloc(sizeof(*f)); f->fd = fd; - f->error = 0; f->offset = 0; + f->total = 0; + f->tp = tp; + f->name = name; f->do_crc = 0; - SHA1_Init(&f->ctx); + git_SHA1_Init(&f->ctx); return f; }