mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add throughput display to git-push

Browse Source 
This one triggers only when git-pack-objects is called with
--all-progress and --stdout which is the combination used by
git-push.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nicolas Pitre 2007-10-30 17:06:21 -04:00 committed by Junio C Hamano
parent 74b6792f7b
commit 2a128d63dc
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-pack-objects.c
View File

@ -606,7 +606,7 @@ static void write_pack_file(void)
char *pack_tmp_name = NULL; char *pack_tmp_name = NULL;
if (pack_to_stdout) { if (pack_to_stdout) {
f = sha1fd(1, "<stdout>"); f = sha1fd_throughput(1, "<stdout>", progress_state);
} else { } else {
char tmpname[PATH_MAX]; char tmpname[PATH_MAX];
int fd; int fd;

8
csum-file.c
View File

@ -8,6 +8,7 @@
* able to verify hasn't been messed with afterwards. * able to verify hasn't been messed with afterwards.
*/ */
#include "cache.h" #include "cache.h"
#include "progress.h"
#include "csum-file.h" #include "csum-file.h"
static void sha1flush(struct sha1file *f, unsigned int count) static void sha1flush(struct sha1file *f, unsigned int count)
@ -17,6 +18,7 @@ static void sha1flush(struct sha1file *f, unsigned int count)
for (;;) { for (;;) {
int ret = xwrite(f->fd, buf, count); int ret = xwrite(f->fd, buf, count);
if (ret > 0) { if (ret > 0) {
display_throughput(f->tp, ret);
buf = (char *) buf + ret; buf = (char *) buf + ret;
count -= ret; count -= ret;
if (count) if (count)
@ -79,6 +81,11 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count)
} }
struct sha1file *sha1fd(int fd, const char *name) struct sha1file *sha1fd(int fd, const char *name)
{
return sha1fd_throughput(fd, name, NULL);
}
struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp)
{ {
struct sha1file *f; struct sha1file *f;
unsigned len; unsigned len;
@ -94,6 +101,7 @@ struct sha1file *sha1fd(int fd, const char *name)
f->fd = fd; f->fd = fd;
f->error = 0; f->error = 0;
f->offset = 0; f->offset = 0;
f->tp = tp;
f->do_crc = 0; f->do_crc = 0;
SHA1_Init(&f->ctx); SHA1_Init(&f->ctx);
return f; return f;

4
csum-file.h
View File

@ -1,11 +1,14 @@
#ifndef CSUM_FILE_H #ifndef CSUM_FILE_H
#define CSUM_FILE_H #define CSUM_FILE_H
struct progress;
/* A SHA1-protected file */ /* A SHA1-protected file */
struct sha1file { struct sha1file {
int fd, error; int fd, error;
unsigned int offset, namelen; unsigned int offset, namelen;
SHA_CTX ctx; SHA_CTX ctx;
struct progress *tp;
char name[PATH_MAX]; char name[PATH_MAX];
int do_crc; int do_crc;
uint32_t crc32; uint32_t crc32;
@ -13,6 +16,7 @@ struct sha1file {
}; };
extern struct sha1file *sha1fd(int fd, const char *name); extern struct sha1file *sha1fd(int fd, const char *name);
extern struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp);
extern int sha1close(struct sha1file *, unsigned char *, int); extern int sha1close(struct sha1file *, unsigned char *, int);
extern int sha1write(struct sha1file *, void *, unsigned int); extern int sha1write(struct sha1file *, void *, unsigned int);
extern void crc32_begin(struct sha1file *); extern void crc32_begin(struct sha1file *);