Commit 2ce68b2f7dacf0570238e20785be3ec2b3f4ad71
2018-09-09T16:07:11
don't redundantly open pack file in dump_delta_chain_to_file()
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
diff --git a/lib/pack.c b/lib/pack.c
index 31e1980..5674cbe 100644
--- a/lib/pack.c
+++ b/lib/pack.c
@@ -1254,7 +1254,7 @@ get_delta_chain_max_size(uint64_t *max_size, struct got_delta_chain *deltas)
static const struct got_error *
dump_delta_chain_to_file(size_t *result_size, struct got_delta_chain *deltas,
- const char *path_packfile, FILE *outfile, struct got_repository *repo)
+ struct got_pack *pack, FILE *outfile)
{
const struct got_error *err = NULL;
struct got_delta *delta;
@@ -1293,7 +1293,6 @@ dump_delta_chain_to_file(size_t *result_size, struct got_delta_chain *deltas,
/* Deltas are ordered in ascending order. */
SIMPLEQ_FOREACH(delta, &deltas->entries, entry) {
if (n == 0) {
- struct got_pack *pack;
size_t base_len, mapoff;
off_t delta_data_offset;
@@ -1306,12 +1305,6 @@ dump_delta_chain_to_file(size_t *result_size, struct got_delta_chain *deltas,
goto done;
}
- pack = get_cached_pack(path_packfile, repo);
- if (pack == NULL) {
- err = got_error(GOT_ERR_BAD_DELTA_CHAIN);
- goto done;
- }
-
delta_data_offset = delta->offset + delta->tslen;
if (delta_data_offset >= pack->filesize) {
err = got_error(GOT_ERR_PACK_OFFSET);
@@ -1513,12 +1506,20 @@ got_packfile_extract_object(FILE **f, struct got_object *obj,
struct got_repository *repo)
{
const struct got_error *err = NULL;
+ struct got_pack *pack;
*f = NULL;
if ((obj->flags & GOT_OBJ_FLAG_PACKED) == 0)
return got_error(GOT_ERR_OBJ_NOT_PACKED);
+ pack = get_cached_pack(obj->path_packfile, repo);
+ if (pack == NULL) {
+ err = cache_pack(&pack, obj->path_packfile, NULL, repo);
+ if (err)
+ return err;
+ }
+
*f = got_opentemp();
if (*f == NULL) {
err = got_error_from_errno();
@@ -1526,15 +1527,6 @@ got_packfile_extract_object(FILE **f, struct got_object *obj,
}
if ((obj->flags & GOT_OBJ_FLAG_DELTIFIED) == 0) {
- struct got_pack *pack;
-
- pack = get_cached_pack(obj->path_packfile, repo);
- if (pack == NULL) {
- err = cache_pack(&pack, obj->path_packfile, NULL, repo);
- if (err)
- goto done;
- }
-
if (obj->pack_offset >= pack->filesize) {
err = got_error(GOT_ERR_PACK_OFFSET);
goto done;
@@ -1552,8 +1544,8 @@ got_packfile_extract_object(FILE **f, struct got_object *obj,
err = got_inflate_to_file_fd(&obj->size, pack->fd, *f);
}
} else
- err = dump_delta_chain_to_file(&obj->size,
- &obj->deltas, obj->path_packfile, *f, repo);
+ err = dump_delta_chain_to_file(&obj->size, &obj->deltas, pack,
+ *f);
done:
if (err && *f) {
fclose(*f);