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

Use off_t when we really mean a file offset.

Browse Source 
Not all platforms have declared 'unsigned long' to be a 64 bit value,
but we want to support a 64 bit packfile (or close enough anyway)
in the near future as some projects are getting large enough that
their packed size exceeds 4 GiB.

By using off_t, the POSIX type that is declared to mean an offset
within a file, we support whatever maximum file size the underlying
operating system will handle.  For most modern systems this is up
around 2^60 or higher.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn O. Pearce 2007-03-06 20:44:30 -05:00 committed by Junio C Hamano
parent 7cadf491c6
commit c4001d92be
6 changed files with 54 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cache.h
View File

@ -383,7 +383,7 @@ extern struct packed_git {
} *packed_git; } *packed_git;
struct pack_entry { struct pack_entry {
unsigned int offset; off_t offset;
unsigned char sha1[20]; unsigned char sha1[20];
struct packed_git *p; struct packed_git *p;
}; };
@ -422,15 +422,15 @@ extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
struct packed_git *packs); struct packed_git *packs);
extern void pack_report(void); extern void pack_report(void);
extern unsigned char* use_pack(struct packed_git *, struct pack_window **, unsigned long, unsigned int *); extern unsigned char* use_pack(struct packed_git *, struct pack_window **, off_t, unsigned int *);
extern void unuse_pack(struct pack_window **); extern void unuse_pack(struct pack_window **);
extern struct packed_git *add_packed_git(char *, int, int); extern struct packed_git *add_packed_git(char *, int, int);
extern uint32_t num_packed_objects(const struct packed_git *p); extern uint32_t num_packed_objects(const struct packed_git *p);
extern int nth_packed_object_sha1(const struct packed_git *, uint32_t, unsigned char*); extern int nth_packed_object_sha1(const struct packed_git *, uint32_t, unsigned char*);
extern unsigned long find_pack_entry_one(const unsigned char *, struct packed_git *); extern off_t find_pack_entry_one(const unsigned char *, struct packed_git *);
extern void *unpack_entry(struct packed_git *, unsigned long, enum object_type *, unsigned long *); extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsigned long *);
extern unsigned long unpack_object_header_gently(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep); extern unsigned long unpack_object_header_gently(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
extern const char *packed_object_info_detail(struct packed_git *, unsigned long, unsigned long *, unsigned long *, unsigned int *, unsigned char *); extern const char *packed_object_info_detail(struct packed_git *, off_t, unsigned long *, unsigned long *, unsigned int *, unsigned char *);
/* Dumb servers support */ /* Dumb servers support */
extern int update_server_info(int); extern int update_server_info(int);

4
fast-import.c
View File

@ -133,10 +133,6 @@ Format of STDIN stream:
#define PACK_ID_BITS 16 #define PACK_ID_BITS 16
#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1) #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
#ifndef PRIuMAX
#define PRIuMAX "llu"
#endif
struct object_entry struct object_entry
{ {
struct object_entry *next; struct object_entry *next;

4
git-compat-util.h
View File

@ -70,6 +70,10 @@
#define PATH_MAX 4096 #define PATH_MAX 4096
#endif #endif
#ifndef PRIuMAX
#define PRIuMAX "llu"
#endif
#ifdef __GNUC__ #ifdef __GNUC__
#define NORETURN __attribute__((__noreturn__)) #define NORETURN __attribute__((__noreturn__))
#else #else

21
pack-check.c
View File

@ -4,11 +4,11 @@
static int verify_packfile(struct packed_git *p, static int verify_packfile(struct packed_git *p,
struct pack_window **w_curs) struct pack_window **w_curs)
{ {
unsigned long index_size = p->index_size; off_t index_size = p->index_size;
void *index_base = p->index_base; void *index_base = p->index_base;
SHA_CTX ctx; SHA_CTX ctx;
unsigned char sha1[20]; unsigned char sha1[20];
unsigned long offset = 0, pack_sig = p->pack_size - 20; off_t offset = 0, pack_sig = p->pack_size - 20;
uint32_t nr_objects, i; uint32_t nr_objects, i;
int err; int err;
@ -24,7 +24,7 @@ static int verify_packfile(struct packed_git *p,
unsigned char *in = use_pack(p, w_curs, offset, &remaining); unsigned char *in = use_pack(p, w_curs, offset, &remaining);
offset += remaining; offset += remaining;
if (offset > pack_sig) if (offset > pack_sig)
remaining -= offset - pack_sig; remaining -= (unsigned int)(offset - pack_sig);
SHA1_Update(&ctx, in, remaining); SHA1_Update(&ctx, in, remaining);
} }
SHA1_Final(sha1, &ctx); SHA1_Final(sha1, &ctx);
@ -45,7 +45,8 @@ static int verify_packfile(struct packed_git *p,
unsigned char sha1[20]; unsigned char sha1[20];
void *data; void *data;
enum object_type type; enum object_type type;
unsigned long size, offset; unsigned long size;
off_t offset;
if (nth_packed_object_sha1(p, i, sha1)) if (nth_packed_object_sha1(p, i, sha1))
die("internal error pack-check nth-packed-object"); die("internal error pack-check nth-packed-object");
@ -85,7 +86,7 @@ static void show_pack_info(struct packed_git *p)
const char *type; const char *type;
unsigned long size; unsigned long size;
unsigned long store_size; unsigned long store_size;
unsigned long offset; off_t offset;
unsigned int delta_chain_length; unsigned int delta_chain_length;
if (nth_packed_object_sha1(p, i, sha1)) if (nth_packed_object_sha1(p, i, sha1))
@ -99,9 +100,11 @@ static void show_pack_info(struct packed_git *p)
base_sha1); base_sha1);
printf("%s ", sha1_to_hex(sha1)); printf("%s ", sha1_to_hex(sha1));
if (!delta_chain_length) if (!delta_chain_length)
printf("%-6s %lu %lu\n", type, size, offset); printf("%-6s %lu %"PRIuMAX"\n",
type, size, (uintmax_t)offset);
else { else {
printf("%-6s %lu %lu %u %s\n", type, size, offset, printf("%-6s %lu %"PRIuMAX" %u %s\n",
type, size, (uintmax_t)offset,
delta_chain_length, sha1_to_hex(base_sha1)); delta_chain_length, sha1_to_hex(base_sha1));
if (delta_chain_length < MAX_CHAIN) if (delta_chain_length < MAX_CHAIN)
chain_histogram[delta_chain_length]++; chain_histogram[delta_chain_length]++;
@ -123,7 +126,7 @@ static void show_pack_info(struct packed_git *p)
int verify_pack(struct packed_git *p, int verbose) int verify_pack(struct packed_git *p, int verbose)
{ {
unsigned long index_size = p->index_size; off_t index_size = p->index_size;
void *index_base = p->index_base; void *index_base = p->index_base;
SHA_CTX ctx; SHA_CTX ctx;
unsigned char sha1[20]; unsigned char sha1[20];
@ -132,7 +135,7 @@ int verify_pack(struct packed_git *p, int verbose)
ret = 0; ret = 0;
/* Verify SHA1 sum of the index file */ /* Verify SHA1 sum of the index file */
SHA1_Init(&ctx); SHA1_Init(&ctx);
SHA1_Update(&ctx, index_base, index_size - 20); SHA1_Update(&ctx, index_base, (unsigned int)(index_size - 20));
SHA1_Final(sha1, &ctx); SHA1_Final(sha1, &ctx);
if (hashcmp(sha1, (unsigned char *)index_base + index_size - 20)) if (hashcmp(sha1, (unsigned char *)index_base + index_size - 20))
ret = error("Packfile index for %s SHA1 mismatch", ret = error("Packfile index for %s SHA1 mismatch",

8
pack-redundant.c
View File

@ -396,9 +396,9 @@ static size_t get_pack_redundancy(struct pack_list *pl)
return ret; return ret;
} }
static inline size_t pack_set_bytecount(struct pack_list *pl) static inline off_t pack_set_bytecount(struct pack_list *pl)
{ {
size_t ret = 0; off_t ret = 0;
while (pl) { while (pl) {
ret += pl->pack->pack_size; ret += pl->pack->pack_size;
ret += pl->pack->index_size; ret += pl->pack->index_size;
@ -413,7 +413,7 @@ static void minimize(struct pack_list **min)
*non_unique = NULL, *min_perm = NULL; *non_unique = NULL, *min_perm = NULL;
struct pll *perm, *perm_all, *perm_ok = NULL, *new_perm; struct pll *perm, *perm_all, *perm_ok = NULL, *new_perm;
struct llist *missing; struct llist *missing;
size_t min_perm_size = (size_t)-1, perm_size; off_t min_perm_size = 0, perm_size;
int n; int n;
pl = local_packs; pl = local_packs;
@ -461,7 +461,7 @@ static void minimize(struct pack_list **min)
perm = perm_ok; perm = perm_ok;
while (perm) { while (perm) {
perm_size = pack_set_bytecount(perm->pl); perm_size = pack_set_bytecount(perm->pl);
if (min_perm_size > perm_size) { if (!min_perm_size || min_perm_size > perm_size) {
min_perm_size = perm_size; min_perm_size = perm_size;
min_perm = perm->pl; min_perm = perm->pl;
} }

54
sha1_file.c
View File

@ -629,7 +629,7 @@ static int open_packed_git(struct packed_git *p)
return -1; return -1;
} }
static int in_window(struct pack_window *win, unsigned long offset) static int in_window(struct pack_window *win, off_t offset)
{ {
/* We must promise at least 20 bytes (one hash) after the /* We must promise at least 20 bytes (one hash) after the
* offset is available from this window, otherwise the offset * offset is available from this window, otherwise the offset
@ -644,7 +644,7 @@ static int in_window(struct pack_window *win, unsigned long offset)
unsigned char* use_pack(struct packed_git *p, unsigned char* use_pack(struct packed_git *p,
struct pack_window **w_cursor, struct pack_window **w_cursor,
unsigned long offset, off_t offset,
unsigned int *left) unsigned int *left)
{ {
struct pack_window *win = *w_cursor; struct pack_window *win = *w_cursor;
@ -1049,14 +1049,14 @@ void * unpack_sha1_file(void *map, unsigned long mapsize, enum object_type *type
return unpack_sha1_rest(&stream, hdr, *size); return unpack_sha1_rest(&stream, hdr, *size);
} }
static unsigned long get_delta_base(struct packed_git *p, static off_t get_delta_base(struct packed_git *p,
struct pack_window **w_curs, struct pack_window **w_curs,
unsigned long *curpos, off_t *curpos,
enum object_type type, enum object_type type,
unsigned long delta_obj_offset) off_t delta_obj_offset)
{ {
unsigned char *base_info = use_pack(p, w_curs, *curpos, NULL); unsigned char *base_info = use_pack(p, w_curs, *curpos, NULL);
unsigned long base_offset; off_t base_offset;
/* use_pack() assured us we have [base_info, base_info + 20) /* use_pack() assured us we have [base_info, base_info + 20)
* as a range that we can look at without walking off the * as a range that we can look at without walking off the
@ -1092,17 +1092,17 @@ static unsigned long get_delta_base(struct packed_git *p,
} }
/* forward declaration for a mutually recursive function */ /* forward declaration for a mutually recursive function */
static int packed_object_info(struct packed_git *p, unsigned long offset, static int packed_object_info(struct packed_git *p, off_t offset,
unsigned long *sizep); unsigned long *sizep);
static int packed_delta_info(struct packed_git *p, static int packed_delta_info(struct packed_git *p,
struct pack_window **w_curs, struct pack_window **w_curs,
unsigned long curpos, off_t curpos,
enum object_type type, enum object_type type,
unsigned long obj_offset, off_t obj_offset,
unsigned long *sizep) unsigned long *sizep)
{ {
unsigned long base_offset; off_t base_offset;
base_offset = get_delta_base(p, w_curs, &curpos, type, obj_offset); base_offset = get_delta_base(p, w_curs, &curpos, type, obj_offset);
type = packed_object_info(p, base_offset, NULL); type = packed_object_info(p, base_offset, NULL);
@ -1152,7 +1152,7 @@ static int packed_delta_info(struct packed_git *p,
static int unpack_object_header(struct packed_git *p, static int unpack_object_header(struct packed_git *p,
struct pack_window **w_curs, struct pack_window **w_curs,
unsigned long *curpos, off_t *curpos,
unsigned long *sizep) unsigned long *sizep)
{ {
unsigned char *base; unsigned char *base;
@ -1176,14 +1176,15 @@ static int unpack_object_header(struct packed_git *p,
} }
const char *packed_object_info_detail(struct packed_git *p, const char *packed_object_info_detail(struct packed_git *p,
unsigned long obj_offset, off_t obj_offset,
unsigned long *size, unsigned long *size,
unsigned long *store_size, unsigned long *store_size,
unsigned int *delta_chain_length, unsigned int *delta_chain_length,
unsigned char *base_sha1) unsigned char *base_sha1)
{ {
struct pack_window *w_curs = NULL; struct pack_window *w_curs = NULL;
unsigned long curpos, dummy; off_t curpos;
unsigned long dummy;
unsigned char *next_sha1; unsigned char *next_sha1;
enum object_type type; enum object_type type;
@ -1223,11 +1224,12 @@ const char *packed_object_info_detail(struct packed_git *p,
} }
} }
static int packed_object_info(struct packed_git *p, unsigned long obj_offset, static int packed_object_info(struct packed_git *p, off_t obj_offset,
unsigned long *sizep) unsigned long *sizep)
{ {
struct pack_window *w_curs = NULL; struct pack_window *w_curs = NULL;
unsigned long size, curpos = obj_offset; unsigned long size;
off_t curpos = obj_offset;
enum object_type type; enum object_type type;
type = unpack_object_header(p, &w_curs, &curpos, &size); type = unpack_object_header(p, &w_curs, &curpos, &size);
@ -1255,7 +1257,7 @@ static int packed_object_info(struct packed_git *p, unsigned long obj_offset,
static void *unpack_compressed_entry(struct packed_git *p, static void *unpack_compressed_entry(struct packed_git *p,
struct pack_window **w_curs, struct pack_window **w_curs,
unsigned long curpos, off_t curpos,
unsigned long size) unsigned long size)
{ {
int st; int st;
@ -1286,20 +1288,22 @@ static void *unpack_compressed_entry(struct packed_git *p,
static void *unpack_delta_entry(struct packed_git *p, static void *unpack_delta_entry(struct packed_git *p,
struct pack_window **w_curs, struct pack_window **w_curs,
unsigned long curpos, off_t curpos,
unsigned long delta_size, unsigned long delta_size,
unsigned long obj_offset, off_t obj_offset,
enum object_type *type, enum object_type *type,
unsigned long *sizep) unsigned long *sizep)
{ {
void *delta_data, *result, *base; void *delta_data, *result, *base;
unsigned long base_size, base_offset; unsigned long base_size;
off_t base_offset;
base_offset = get_delta_base(p, w_curs, &curpos, *type, obj_offset); base_offset = get_delta_base(p, w_curs, &curpos, *type, obj_offset);
base = unpack_entry(p, base_offset, type, &base_size); base = unpack_entry(p, base_offset, type, &base_size);
if (!base) if (!base)
die("failed to read delta base object at %lu from %s", die("failed to read delta base object"
base_offset, p->pack_name); " at %"PRIuMAX" from %s",
(uintmax_t)base_offset, p->pack_name);
delta_data = unpack_compressed_entry(p, w_curs, curpos, delta_size); delta_data = unpack_compressed_entry(p, w_curs, curpos, delta_size);
result = patch_delta(base, base_size, result = patch_delta(base, base_size,
@ -1312,11 +1316,11 @@ static void *unpack_delta_entry(struct packed_git *p,
return result; return result;
} }
void *unpack_entry(struct packed_git *p, unsigned long obj_offset, void *unpack_entry(struct packed_git *p, off_t obj_offset,
enum object_type *type, unsigned long *sizep) enum object_type *type, unsigned long *sizep)
{ {
struct pack_window *w_curs = NULL; struct pack_window *w_curs = NULL;
unsigned long curpos = obj_offset; off_t curpos = obj_offset;
void *data; void *data;
*type = unpack_object_header(p, &w_curs, &curpos, sizep); *type = unpack_object_header(p, &w_curs, &curpos, sizep);
@ -1355,7 +1359,7 @@ int nth_packed_object_sha1(const struct packed_git *p, uint32_t n,
return 0; return 0;
} }
unsigned long find_pack_entry_one(const unsigned char *sha1, off_t find_pack_entry_one(const unsigned char *sha1,
struct packed_git *p) struct packed_git *p)
{ {
uint32_t *level1_ofs = p->index_base; uint32_t *level1_ofs = p->index_base;
@ -1397,7 +1401,7 @@ static int matches_pack_name(struct packed_git *p, const char *ig)
static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e, const char **ignore_packed) static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e, const char **ignore_packed)
{ {
struct packed_git *p; struct packed_git *p;
unsigned long offset; off_t offset;
prepare_packed_git(); prepare_packed_git();