undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-objects: improve returned information from write_one()

Browse Source 
This function returns 0 when the current object couldn't be written
due to the pack size limit, otherwise the current offset in the pack.
There is a problem with this approach however, since current object
could be a delta and its delta base might just have been written in
the same write_one() call, but those successfully written objects are
not accounted in the offset variable tracked by the caller. Currently
this is not an issue but a subsequent patch will need this.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nicolas Pitre 2008-08-29 16:07:58 -04:00 committed by Junio C Hamano
parent 53d1589ff6
commit 6ed7f25e95
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
builtin-pack-objects.c
View File

@ -410,25 +410,22 @@ static unsigned long write_object(struct sha1file *f,
return hdrlen + datalen; return hdrlen + datalen;
} }
static off_t write_one(struct sha1file *f, static int write_one(struct sha1file *f,
struct object_entry *e, struct object_entry *e,
off_t offset) off_t *offset)
{ {
unsigned long size; unsigned long size;
/* offset is non zero if object is written already. */ /* offset is non zero if object is written already. */
if (e->idx.offset || e->preferred_base) if (e->idx.offset || e->preferred_base)
return offset; return 1;
/* if we are deltified, write out base object first. */ /* if we are deltified, write out base object first. */
if (e->delta) { if (e->delta && !write_one(f, e->delta, offset))
offset = write_one(f, e->delta, offset); return 0;
if (!offset)
return 0;
}
e->idx.offset = offset; e->idx.offset = *offset;
size = write_object(f, e, offset); size = write_object(f, e, *offset);
if (!size) { if (!size) {
e->idx.offset = 0; e->idx.offset = 0;
return 0; return 0;
@ -436,9 +433,10 @@ static off_t write_one(struct sha1file *f,
written_list[nr_written++] = &e->idx; written_list[nr_written++] = &e->idx;
/* make sure off_t is sufficiently large not to wrap */ /* make sure off_t is sufficiently large not to wrap */
if (offset > offset + size) if (*offset > *offset + size)
die("pack too large for current definition of off_t"); die("pack too large for current definition of off_t");
return offset + size; *offset += size;
return 1;
} }
/* forward declaration for write_pack_file */ /* forward declaration for write_pack_file */
@ -448,7 +446,7 @@ static void write_pack_file(void)
{ {
uint32_t i = 0, j; uint32_t i = 0, j;
struct sha1file *f; struct sha1file *f;
off_t offset, offset_one, last_obj_offset = 0; off_t offset;
struct pack_header hdr; struct pack_header hdr;
uint32_t nr_remaining = nr_result; uint32_t nr_remaining = nr_result;
time_t last_mtime = 0; time_t last_mtime = 0;
@ -480,11 +478,8 @@ static void write_pack_file(void)
offset = sizeof(hdr); offset = sizeof(hdr);
nr_written = 0; nr_written = 0;
for (; i < nr_objects; i++) { for (; i < nr_objects; i++) {
last_obj_offset = offset; if (!write_one(f, objects + i, &offset))
offset_one = write_one(f, objects + i, offset);
if (!offset_one)
break; break;
offset = offset_one;
display_progress(progress_state, written); display_progress(progress_state, written);
} }