pack-objects.c 85.3 KB
Newer Older
1
#include "builtin.h"
2
#include "cache.h"
3
#include "repository.h"
4
#include "config.h"
5
#include "attr.h"
6
#include "object.h"
7 8 9 10
#include "blob.h"
#include "commit.h"
#include "tag.h"
#include "tree.h"
11
#include "delta.h"
12
#include "pack.h"
13
#include "pack-revindex.h"
14
#include "csum-file.h"
J
Junio C Hamano 已提交
15
#include "tree-walk.h"
16 17 18
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
19 20
#include "list-objects-filter.h"
#include "list-objects-filter-options.h"
21
#include "pack-objects.h"
N
Nicolas Pitre 已提交
22
#include "progress.h"
23
#include "refs.h"
24
#include "streaming.h"
25
#include "thread-utils.h"
26
#include "pack-bitmap.h"
27 28
#include "reachable.h"
#include "sha1-array.h"
J
Jeff King 已提交
29
#include "argv-array.h"
30
#include "list.h"
31
#include "packfile.h"
32
#include "object-store.h"
33
#include "dir.h"
N
Nicolas Pitre 已提交
34

35
static const char *pack_usage[] = {
36 37
	N_("git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"),
	N_("git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"),
38 39
	NULL
};
40

41
/*
42 43 44
 * Objects we are going to pack are collected in the `to_pack` structure.
 * It contains an array (dynamically expanded) of the object data, and a map
 * that can resolve SHA1s to their position in the array.
45
 */
46 47
static struct packing_data to_pack;

48
static struct pack_idx_entry **written_list;
49
static uint32_t nr_result, nr_written;
50

51
static int non_empty;
52
static int reuse_delta = 1, reuse_object = 1;
J
Junio C Hamano 已提交
53
static int keep_unreachable, unpack_unreachable, include_tag;
54
static timestamp_t unpack_unreachable_expiration;
55
static int pack_loose_unreachable;
56
static int local;
57
static int have_non_local_packs;
58
static int incremental;
59 60
static int ignore_packed_keep_on_disk;
static int ignore_packed_keep_in_core;
61
static int allow_ofs_delta;
62
static struct pack_idx_option pack_idx_opts;
63
static const char *base_name;
J
Junio C Hamano 已提交
64
static int progress = 1;
65
static int window = 10;
66
static unsigned long pack_size_limit;
67
static int depth = 50;
68
static int delta_search_threads;
69
static int pack_to_stdout;
70
static int num_preferred_base;
71
static struct progress *progress_state;
72

73 74 75 76
static struct packed_git *reuse_packfile;
static uint32_t reuse_packfile_objects;
static off_t reuse_packfile_offset;

77 78
static int use_bitmap_index_default = 1;
static int use_bitmap_index = -1;
79
static int write_bitmap_index;
80
static uint16_t write_bitmap_options;
81

82 83
static int exclude_promisor_objects;

84
static unsigned long delta_cache_size = 0;
85
static unsigned long max_delta_cache_size = DEFAULT_DELTA_CACHE_SIZE;
86
static unsigned long cache_max_small_delta_size = 1000;
87

88 89
static unsigned long window_memory_limit = 0;

90 91 92
static struct list_objects_filter_options filter_options;

enum missing_action {
93 94 95
	MA_ERROR = 0,      /* fail if any missing objects are encountered */
	MA_ALLOW_ANY,      /* silently allow ALL missing objects */
	MA_ALLOW_PROMISOR, /* silently allow all missing PROMISOR objects */
96 97 98 99
};
static enum missing_action arg_missing_action;
static show_object_fn fn_show_object;

100 101 102
/*
 * stats
 */
103 104
static uint32_t written, written_delta;
static uint32_t reused, reused_delta;
105

106 107 108 109 110 111 112 113 114 115 116
/*
 * Indexed commits
 */
static struct commit **indexed_commits;
static unsigned int indexed_commits_nr;
static unsigned int indexed_commits_alloc;

static void index_commit_for_bitmap(struct commit *commit)
{
	if (indexed_commits_nr >= indexed_commits_alloc) {
		indexed_commits_alloc = (indexed_commits_alloc + 32) * 2;
117
		REALLOC_ARRAY(indexed_commits, indexed_commits_alloc);
118 119 120 121
	}

	indexed_commits[indexed_commits_nr++] = commit;
}
122

N
Nicolas Pitre 已提交
123
static void *get_delta(struct object_entry *entry)
124
{
N
Nicolas Pitre 已提交
125 126
	unsigned long size, base_size, delta_size;
	void *buf, *base_buf, *delta_buf;
127
	enum object_type type;
128

129
	buf = read_object_file(&entry->idx.oid, &type, &size);
N
Nicolas Pitre 已提交
130
	if (!buf)
131
		die("unable to read %s", oid_to_hex(&entry->idx.oid));
132
	base_buf = read_object_file(&entry->delta->idx.oid, &type, &base_size);
N
Nicolas Pitre 已提交
133
	if (!base_buf)
134 135
		die("unable to read %s",
		    oid_to_hex(&entry->delta->idx.oid));
N
Nicolas Pitre 已提交
136
	delta_buf = diff_delta(base_buf, base_size,
137
			       buf, size, &delta_size, 0);
N
Nicolas Pitre 已提交
138
	if (!delta_buf || delta_size != entry->delta_size)
J
Junio C Hamano 已提交
139
		die("delta size changed");
N
Nicolas Pitre 已提交
140 141
	free(buf);
	free(base_buf);
142 143 144
	return delta_buf;
}

145 146
static unsigned long do_compress(void **pptr, unsigned long size)
{
147
	git_zstream stream;
148 149 150
	void *in, *out;
	unsigned long maxsize;

151
	git_deflate_init(&stream, pack_compression_level);
J
Junio C Hamano 已提交
152
	maxsize = git_deflate_bound(&stream, size);
153 154 155 156 157 158 159 160 161

	in = *pptr;
	out = xmalloc(maxsize);
	*pptr = out;

	stream.next_in = in;
	stream.avail_in = size;
	stream.next_out = out;
	stream.avail_out = maxsize;
162
	while (git_deflate(&stream, Z_FINISH) == Z_OK)
163
		; /* nothing */
164
	git_deflate_end(&stream);
165 166 167 168 169

	free(in);
	return stream.total_out;
}

170
static unsigned long write_large_blob_data(struct git_istream *st, struct hashfile *f,
171
					   const struct object_id *oid)
172 173 174 175 176 177 178 179 180 181 182 183 184
{
	git_zstream stream;
	unsigned char ibuf[1024 * 16];
	unsigned char obuf[1024 * 16];
	unsigned long olen = 0;

	git_deflate_init(&stream, pack_compression_level);

	for (;;) {
		ssize_t readlen;
		int zret = Z_OK;
		readlen = read_istream(st, ibuf, sizeof(ibuf));
		if (readlen == -1)
185
			die(_("unable to read %s"), oid_to_hex(oid));
186 187 188 189 190 191 192 193

		stream.next_in = ibuf;
		stream.avail_in = readlen;
		while ((stream.avail_in || readlen == 0) &&
		       (zret == Z_OK || zret == Z_BUF_ERROR)) {
			stream.next_out = obuf;
			stream.avail_out = sizeof(obuf);
			zret = git_deflate(&stream, readlen ? 0 : Z_FINISH);
194
			hashwrite(f, obuf, stream.next_out - obuf);
195 196 197 198 199 200 201 202 203 204 205 206 207 208
			olen += stream.next_out - obuf;
		}
		if (stream.avail_in)
			die(_("deflate error (%d)"), zret);
		if (readlen == 0) {
			if (zret != Z_STREAM_END)
				die(_("deflate error (%d)"), zret);
			break;
		}
	}
	git_deflate_end(&stream);
	return olen;
}

209 210 211 212
/*
 * we are going to reuse the existing object data as is.  make
 * sure it is not corrupt.
 */
213 214
static int check_pack_inflate(struct packed_git *p,
		struct pack_window **w_curs,
215 216
		off_t offset,
		off_t len,
217 218
		unsigned long expect)
{
219
	git_zstream stream;
220 221 222 223
	unsigned char fakebuf[4096], *in;
	int st;

	memset(&stream, 0, sizeof(stream));
224
	git_inflate_init(&stream);
225 226 227 228 229
	do {
		in = use_pack(p, w_curs, offset, &stream.avail_in);
		stream.next_in = in;
		stream.next_out = fakebuf;
		stream.avail_out = sizeof(fakebuf);
230
		st = git_inflate(&stream, Z_FINISH);
231 232
		offset += stream.next_in - in;
	} while (st == Z_OK || st == Z_BUF_ERROR);
233
	git_inflate_end(&stream);
234 235 236 237 238
	return (st == Z_STREAM_END &&
		stream.total_out == expect &&
		stream.total_in == len) ? 0 : -1;
}

239
static void copy_pack_data(struct hashfile *f,
240 241
		struct packed_git *p,
		struct pack_window **w_curs,
242 243
		off_t offset,
		off_t len)
244 245
{
	unsigned char *in;
246
	unsigned long avail;
247 248 249 250

	while (len) {
		in = use_pack(p, w_curs, offset, &avail);
		if (avail > len)
251
			avail = (unsigned long)len;
252
		hashwrite(f, in, avail);
253 254 255 256 257
		offset += avail;
		len -= avail;
	}
}

258
/* Return 0 if we will bust the pack-size limit */
259
static unsigned long write_no_reuse_object(struct hashfile *f, struct object_entry *entry,
260
					   unsigned long limit, int usable_delta)
261
{
262
	unsigned long size, datalen;
263 264
	unsigned char header[MAX_PACK_OBJECT_HEADER],
		      dheader[MAX_PACK_OBJECT_HEADER];
265
	unsigned hdrlen;
266
	enum object_type type;
267
	void *buf;
268
	struct git_istream *st = NULL;
269 270

	if (!usable_delta) {
271 272
		if (entry->type == OBJ_BLOB &&
		    entry->size > big_file_threshold &&
273
		    (st = open_istream(&entry->idx.oid, &type, &size, NULL)) != NULL)
274 275
			buf = NULL;
		else {
276
			buf = read_object_file(&entry->idx.oid, &type, &size);
277
			if (!buf)
278 279
				die(_("unable to read %s"),
				    oid_to_hex(&entry->idx.oid));
280
		}
281 282 283 284
		/*
		 * make sure no cached delta data remains from a
		 * previous attempt before a pack split occurred.
		 */
285
		FREE_AND_NULL(entry->delta_data);
286 287 288 289 290 291 292 293 294 295 296 297 298 299
		entry->z_delta_size = 0;
	} else if (entry->delta_data) {
		size = entry->delta_size;
		buf = entry->delta_data;
		entry->delta_data = NULL;
		type = (allow_ofs_delta && entry->delta->idx.offset) ?
			OBJ_OFS_DELTA : OBJ_REF_DELTA;
	} else {
		buf = get_delta(entry);
		size = entry->delta_size;
		type = (allow_ofs_delta && entry->delta->idx.offset) ?
			OBJ_OFS_DELTA : OBJ_REF_DELTA;
	}

300 301 302
	if (st)	/* large blob case, just assume we don't compress well */
		datalen = size;
	else if (entry->z_delta_size)
303 304 305 306 307 308 309 310
		datalen = entry->z_delta_size;
	else
		datalen = do_compress(&buf, size);

	/*
	 * The object header is a byte of 'type' followed by zero or
	 * more bytes of length.
	 */
311 312
	hdrlen = encode_in_pack_object_header(header, sizeof(header),
					      type, size);
313 314 315 316 317 318 319 320 321 322 323 324 325

	if (type == OBJ_OFS_DELTA) {
		/*
		 * Deltas with relative base contain an additional
		 * encoding of the relative offset for the delta
		 * base from this object's position in the pack.
		 */
		off_t ofs = entry->idx.offset - entry->delta->idx.offset;
		unsigned pos = sizeof(dheader) - 1;
		dheader[pos] = ofs & 127;
		while (ofs >>= 7)
			dheader[--pos] = 128 | (--ofs & 127);
		if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
326 327
			if (st)
				close_istream(st);
328 329 330
			free(buf);
			return 0;
		}
331 332
		hashwrite(f, header, hdrlen);
		hashwrite(f, dheader + pos, sizeof(dheader) - pos);
333 334 335 336 337 338 339
		hdrlen += sizeof(dheader) - pos;
	} else if (type == OBJ_REF_DELTA) {
		/*
		 * Deltas with a base reference contain
		 * an additional 20 bytes for the base sha1.
		 */
		if (limit && hdrlen + 20 + datalen + 20 >= limit) {
340 341
			if (st)
				close_istream(st);
342 343 344
			free(buf);
			return 0;
		}
345 346
		hashwrite(f, header, hdrlen);
		hashwrite(f, entry->delta->idx.oid.hash, 20);
347 348 349
		hdrlen += 20;
	} else {
		if (limit && hdrlen + datalen + 20 >= limit) {
350 351
			if (st)
				close_istream(st);
352 353 354
			free(buf);
			return 0;
		}
355
		hashwrite(f, header, hdrlen);
356
	}
357
	if (st) {
358
		datalen = write_large_blob_data(st, f, &entry->idx.oid);
359 360
		close_istream(st);
	} else {
361
		hashwrite(f, buf, datalen);
362 363
		free(buf);
	}
364 365 366 367 368

	return hdrlen + datalen;
}

/* Return 0 if we will bust the pack-size limit */
369
static off_t write_reuse_object(struct hashfile *f, struct object_entry *entry,
370
				unsigned long limit, int usable_delta)
371 372 373 374 375 376
{
	struct packed_git *p = entry->in_pack;
	struct pack_window *w_curs = NULL;
	struct revindex_entry *revidx;
	off_t offset;
	enum object_type type = entry->type;
377
	off_t datalen;
378 379
	unsigned char header[MAX_PACK_OBJECT_HEADER],
		      dheader[MAX_PACK_OBJECT_HEADER];
380 381 382 383 384
	unsigned hdrlen;

	if (entry->delta)
		type = (allow_ofs_delta && entry->delta->idx.offset) ?
			OBJ_OFS_DELTA : OBJ_REF_DELTA;
385 386
	hdrlen = encode_in_pack_object_header(header, sizeof(header),
					      type, entry->size);
387 388 389 390 391 392

	offset = entry->in_pack_offset;
	revidx = find_pack_revindex(p, offset);
	datalen = revidx[1].offset - offset;
	if (!pack_to_stdout && p->index_version > 1 &&
	    check_pack_crc(p, &w_curs, offset, datalen, revidx->nr)) {
393 394
		error("bad packed object CRC for %s",
		      oid_to_hex(&entry->idx.oid));
395 396 397 398 399 400 401 402 403
		unuse_pack(&w_curs);
		return write_no_reuse_object(f, entry, limit, usable_delta);
	}

	offset += entry->in_pack_header_size;
	datalen -= entry->in_pack_header_size;

	if (!pack_to_stdout && p->index_version == 1 &&
	    check_pack_inflate(p, &w_curs, offset, datalen, entry->size)) {
404 405
		error("corrupt packed object for %s",
		      oid_to_hex(&entry->idx.oid));
406 407 408 409 410 411 412 413 414 415 416 417 418 419
		unuse_pack(&w_curs);
		return write_no_reuse_object(f, entry, limit, usable_delta);
	}

	if (type == OBJ_OFS_DELTA) {
		off_t ofs = entry->idx.offset - entry->delta->idx.offset;
		unsigned pos = sizeof(dheader) - 1;
		dheader[pos] = ofs & 127;
		while (ofs >>= 7)
			dheader[--pos] = 128 | (--ofs & 127);
		if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
			unuse_pack(&w_curs);
			return 0;
		}
420 421
		hashwrite(f, header, hdrlen);
		hashwrite(f, dheader + pos, sizeof(dheader) - pos);
422 423 424 425 426 427 428
		hdrlen += sizeof(dheader) - pos;
		reused_delta++;
	} else if (type == OBJ_REF_DELTA) {
		if (limit && hdrlen + 20 + datalen + 20 >= limit) {
			unuse_pack(&w_curs);
			return 0;
		}
429 430
		hashwrite(f, header, hdrlen);
		hashwrite(f, entry->delta->idx.oid.hash, 20);
431 432 433 434 435 436 437
		hdrlen += 20;
		reused_delta++;
	} else {
		if (limit && hdrlen + datalen + 20 >= limit) {
			unuse_pack(&w_curs);
			return 0;
		}
438
		hashwrite(f, header, hdrlen);
439 440 441 442 443 444 445 446
	}
	copy_pack_data(f, p, &w_curs, offset, datalen);
	unuse_pack(&w_curs);
	reused++;
	return hdrlen + datalen;
}

/* Return 0 if we will bust the pack-size limit */
447
static off_t write_object(struct hashfile *f,
448 449
			  struct object_entry *entry,
			  off_t write_offset)
450
{
451 452
	unsigned long limit;
	off_t len;
453
	int usable_delta, to_reuse;
454

455 456 457
	if (!pack_to_stdout)
		crc32_begin(f);

458
	/* apply size limit if limited packsize and not first object */
459 460 461 462 463 464 465 466 467 468
	if (!pack_size_limit || !nr_written)
		limit = 0;
	else if (pack_size_limit <= write_offset)
		/*
		 * the earlier object did not fit the limit; avoid
		 * mistaking this with unlimited (i.e. limit = 0).
		 */
		limit = 1;
	else
		limit = pack_size_limit - write_offset;
469 470 471 472 473 474 475 476 477 478 479 480

	if (!entry->delta)
		usable_delta = 0;	/* no delta */
	else if (!pack_size_limit)
	       usable_delta = 1;	/* unlimited packfile */
	else if (entry->delta->idx.offset == (off_t)-1)
		usable_delta = 0;	/* base was written to another pack */
	else if (entry->delta->idx.offset)
		usable_delta = 1;	/* base already exists in this pack */
	else
		usable_delta = 0;	/* base could end up in another pack */

481
	if (!reuse_object)
482 483
		to_reuse = 0;	/* explicit */
	else if (!entry->in_pack)
484
		to_reuse = 0;	/* can't reuse what we don't have */
485
	else if (entry->type == OBJ_REF_DELTA || entry->type == OBJ_OFS_DELTA)
486 487 488
				/* check_object() decided it for us ... */
		to_reuse = usable_delta;
				/* ... but pack split may override that */
489
	else if (entry->type != entry->in_pack_type)
490 491 492 493 494 495 496 497
		to_reuse = 0;	/* pack has delta which is unusable */
	else if (entry->delta)
		to_reuse = 0;	/* we want to pack afresh */
	else
		to_reuse = 1;	/* we have it in-pack undeltified,
				 * and we do not need to deltify it.
				 */

498 499 500 501 502 503
	if (!to_reuse)
		len = write_no_reuse_object(f, entry, limit, usable_delta);
	else
		len = write_reuse_object(f, entry, limit, usable_delta);
	if (!len)
		return 0;
504

505
	if (usable_delta)
506
		written_delta++;
507
	written++;
508
	if (!pack_to_stdout)
G
Geert Bosch 已提交
509
		entry->idx.crc32 = crc32_end(f);
510
	return len;
511 512
}

513 514 515 516 517 518 519
enum write_one_status {
	WRITE_ONE_SKIP = -1, /* already written */
	WRITE_ONE_BREAK = 0, /* writing this will bust the limit; not written */
	WRITE_ONE_WRITTEN = 1, /* normal */
	WRITE_ONE_RECURSIVE = 2 /* already scheduled to be written */
};

520
static enum write_one_status write_one(struct hashfile *f,
521 522
				       struct object_entry *e,
				       off_t *offset)
523
{
524
	off_t size;
525
	int recursing;
526

527 528 529 530 531 532 533 534
	/*
	 * we set offset to 1 (which is an impossible value) to mark
	 * the fact that this object is involved in "write its base
	 * first before writing a deltified object" recursion.
	 */
	recursing = (e->idx.offset == 1);
	if (recursing) {
		warning("recursive delta detected for object %s",
535
			oid_to_hex(&e->idx.oid));
536 537 538 539 540
		return WRITE_ONE_RECURSIVE;
	} else if (e->idx.offset || e->preferred_base) {
		/* offset is non zero if object is written already. */
		return WRITE_ONE_SKIP;
	}
541

542
	/* if we are deltified, write out base object first. */
543 544 545 546 547 548 549 550 551 552 553 554 555 556
	if (e->delta) {
		e->idx.offset = 1; /* now recurse */
		switch (write_one(f, e->delta, offset)) {
		case WRITE_ONE_RECURSIVE:
			/* we cannot depend on this one */
			e->delta = NULL;
			break;
		default:
			break;
		case WRITE_ONE_BREAK:
			e->idx.offset = recursing;
			return WRITE_ONE_BREAK;
		}
	}
557

558 559
	e->idx.offset = *offset;
	size = write_object(f, e, *offset);
560
	if (!size) {
561 562
		e->idx.offset = recursing;
		return WRITE_ONE_BREAK;
563
	}
564
	written_list[nr_written++] = &e->idx;
565 566

	/* make sure off_t is sufficiently large not to wrap */
567
	if (signed_add_overflows(*offset, size))
568
		die("pack too large for current definition of off_t");
569
	*offset += size;
570
	return WRITE_ONE_WRITTEN;
571 572
}

573
static int mark_tagged(const char *path, const struct object_id *oid, int flag,
574 575
		       void *cb_data)
{
576
	struct object_id peeled;
577
	struct object_entry *entry = packlist_find(&to_pack, oid->hash, NULL);
578 579 580

	if (entry)
		entry->tagged = 1;
581
	if (!peel_ref(path, &peeled)) {
582
		entry = packlist_find(&to_pack, peeled.hash, NULL);
583 584 585 586 587 588
		if (entry)
			entry->tagged = 1;
	}
	return 0;
}

589
static inline void add_to_write_order(struct object_entry **wo,
590
			       unsigned int *endp,
591 592 593 594 595 596 597 598 599
			       struct object_entry *e)
{
	if (e->filled)
		return;
	wo[(*endp)++] = e;
	e->filled = 1;
}

static void add_descendants_to_write_order(struct object_entry **wo,
600
					   unsigned int *endp,
601 602
					   struct object_entry *e)
{
603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639
	int add_to_order = 1;
	while (e) {
		if (add_to_order) {
			struct object_entry *s;
			/* add this node... */
			add_to_write_order(wo, endp, e);
			/* all its siblings... */
			for (s = e->delta_sibling; s; s = s->delta_sibling) {
				add_to_write_order(wo, endp, s);
			}
		}
		/* drop down a level to add left subtree nodes if possible */
		if (e->delta_child) {
			add_to_order = 1;
			e = e->delta_child;
		} else {
			add_to_order = 0;
			/* our sibling might have some children, it is next */
			if (e->delta_sibling) {
				e = e->delta_sibling;
				continue;
			}
			/* go back to our parent node */
			e = e->delta;
			while (e && !e->delta_sibling) {
				/* we're on the right side of a subtree, keep
				 * going up until we can go right again */
				e = e->delta;
			}
			if (!e) {
				/* done- we hit our original root node */
				return;
			}
			/* pass it off to sibling at this level */
			e = e->delta_sibling;
		}
	};
640 641 642
}

static void add_family_to_write_order(struct object_entry **wo,
643
				      unsigned int *endp,
644 645 646 647 648 649 650 651 652 653 654
				      struct object_entry *e)
{
	struct object_entry *root;

	for (root = e; root->delta; root = root->delta)
		; /* nothing */
	add_descendants_to_write_order(wo, endp, root);
}

static struct object_entry **compute_write_order(void)
{
655
	unsigned int i, wo_end, last_untagged;
656

J
Jeff King 已提交
657
	struct object_entry **wo;
658
	struct object_entry *objects = to_pack.objects;
659

660
	for (i = 0; i < to_pack.nr_objects; i++) {
661 662 663 664 665 666 667 668 669 670 671
		objects[i].tagged = 0;
		objects[i].filled = 0;
		objects[i].delta_child = NULL;
		objects[i].delta_sibling = NULL;
	}

	/*
	 * Fully connect delta_child/delta_sibling network.
	 * Make sure delta_sibling is sorted in the original
	 * recency order.
	 */
672
	for (i = to_pack.nr_objects; i > 0;) {
673
		struct object_entry *e = &objects[--i];
674 675 676 677 678 679 680 681 682 683
		if (!e->delta)
			continue;
		/* Mark me as the first child */
		e->delta_sibling = e->delta->delta_child;
		e->delta->delta_child = e;
	}

	/*
	 * Mark objects that are at the tip of tags.
	 */
684
	for_each_tag_ref(mark_tagged, NULL);
685 686

	/*
687
	 * Give the objects in the original recency order until
688 689
	 * we see a tagged tip.
	 */
J
Jeff King 已提交
690
	ALLOC_ARRAY(wo, to_pack.nr_objects);
691
	for (i = wo_end = 0; i < to_pack.nr_objects; i++) {
692 693 694 695
		if (objects[i].tagged)
			break;
		add_to_write_order(wo, &wo_end, &objects[i]);
	}
696
	last_untagged = i;
697 698 699 700

	/*
	 * Then fill all the tagged tips.
	 */
701
	for (; i < to_pack.nr_objects; i++) {
702 703 704 705 706 707 708
		if (objects[i].tagged)
			add_to_write_order(wo, &wo_end, &objects[i]);
	}

	/*
	 * And then all remaining commits and tags.
	 */
709
	for (i = last_untagged; i < to_pack.nr_objects; i++) {
710 711 712 713 714 715 716 717 718
		if (objects[i].type != OBJ_COMMIT &&
		    objects[i].type != OBJ_TAG)
			continue;
		add_to_write_order(wo, &wo_end, &objects[i]);
	}

	/*
	 * And then all the trees.
	 */
719
	for (i = last_untagged; i < to_pack.nr_objects; i++) {
720 721 722 723 724 725 726 727
		if (objects[i].type != OBJ_TREE)
			continue;
		add_to_write_order(wo, &wo_end, &objects[i]);
	}

	/*
	 * Finally all the rest in really tight order
	 */
728
	for (i = last_untagged; i < to_pack.nr_objects; i++) {
729 730 731 732
		if (!objects[i].filled)
			add_family_to_write_order(wo, &wo_end, &objects[i]);
	}

733 734
	if (wo_end != to_pack.nr_objects)
		die("ordered %u objects, expected %"PRIu32, wo_end, to_pack.nr_objects);
735 736 737 738

	return wo;
}

739
static off_t write_reused_pack(struct hashfile *f)
740 741
{
	unsigned char buffer[8192];
742
	off_t to_write, total;
743 744 745 746 747
	int fd;

	if (!is_pack_valid(reuse_packfile))
		die("packfile is invalid: %s", reuse_packfile->pack_name);

748
	fd = git_open(reuse_packfile->pack_name);
749 750 751 752 753 754 755 756 757 758
	if (fd < 0)
		die_errno("unable to open packfile for reuse: %s",
			  reuse_packfile->pack_name);

	if (lseek(fd, sizeof(struct pack_header), SEEK_SET) == -1)
		die_errno("unable to seek in reused packfile");

	if (reuse_packfile_offset < 0)
		reuse_packfile_offset = reuse_packfile->pack_size - 20;

759
	total = to_write = reuse_packfile_offset - sizeof(struct pack_header);
760 761 762 763 764 765 766 767 768 769

	while (to_write) {
		int read_pack = xread(fd, buffer, sizeof(buffer));

		if (read_pack <= 0)
			die_errno("unable to read from reused packfile");

		if (read_pack > to_write)
			read_pack = to_write;

770
		hashwrite(f, buffer, read_pack);
771
		to_write -= read_pack;
772 773 774 775 776 777 778 779 780 781 782 783

		/*
		 * We don't know the actual number of objects written,
		 * only how many bytes written, how many bytes total, and
		 * how many objects total. So we can fake it by pretending all
		 * objects we are writing are the same size. This gives us a
		 * smooth progress meter, and at the end it matches the true
		 * answer.
		 */
		written = reuse_packfile_objects *
				(((double)(total - to_write)) / total);
		display_progress(progress_state, written);
784 785 786
	}

	close(fd);
787 788
	written = reuse_packfile_objects;
	display_progress(progress_state, written);
789 790 791
	return reuse_packfile_offset - sizeof(struct pack_header);
}

792 793 794 795
static const char no_split_warning[] = N_(
"disabling bitmap writing, packs are split due to pack.packSizeLimit"
);

796
static void write_pack_file(void)
797
{
798
	uint32_t i = 0, j;
799
	struct hashfile *f;
800
	off_t offset;
801
	uint32_t nr_remaining = nr_result;
802
	time_t last_mtime = 0;
803
	struct object_entry **write_order;
804

805
	if (progress > pack_to_stdout)
806
		progress_state = start_progress(_("Writing objects"), nr_result);
J
Jeff King 已提交
807
	ALLOC_ARRAY(written_list, to_pack.nr_objects);
808
	write_order = compute_write_order();
809

810
	do {
811
		struct object_id oid;
812
		char *pack_tmp_name = NULL;
G
Geert Bosch 已提交
813

814
		if (pack_to_stdout)
815
			f = hashfd_throughput(1, "<stdout>", progress_state);
816 817
		else
			f = create_tmp_packfile(&pack_tmp_name);
818

819
		offset = write_pack_header(f, nr_remaining);
820 821 822 823 824 825 826 827 828

		if (reuse_packfile) {
			off_t packfile_size;
			assert(pack_to_stdout);

			packfile_size = write_reused_pack(f);
			offset += packfile_size;
		}

829
		nr_written = 0;
830
		for (; i < to_pack.nr_objects; i++) {
831
			struct object_entry *e = write_order[i];
832
			if (write_one(f, e, &offset) == WRITE_ONE_BREAK)
833 834 835
				break;
			display_progress(progress_state, written);
		}
836

837 838 839 840
		/*
		 * Did we write the wrong # entries in the header?
		 * If so, rewrite it like in fast-import
		 */
841
		if (pack_to_stdout) {
842
			hashclose(f, oid.hash, CSUM_CLOSE);
843
		} else if (nr_written == nr_remaining) {
844
			hashclose(f, oid.hash, CSUM_FSYNC);
845
		} else {
846
			int fd = hashclose(f, oid.hash, 0);
847 848
			fixup_pack_header_footer(fd, oid.hash, pack_tmp_name,
						 nr_written, oid.hash, offset);
849
			close(fd);
850 851 852 853
			if (write_bitmap_index) {
				warning(_(no_split_warning));
				write_bitmap_index = 0;
			}
854 855 856
		}

		if (!pack_to_stdout) {
857
			struct stat st;
858
			struct strbuf tmpname = STRBUF_INIT;
859

860 861 862 863 864 865 866
			/*
			 * Packs are runtime accessed in their mtime
			 * order since newer packs are more likely to contain
			 * younger objects.  So if we are creating multiple
			 * packs then we should modify the mtime of later ones
			 * to preserve this property.
			 */
867
			if (stat(pack_tmp_name, &st) < 0) {
868
				warning_errno("failed to stat %s", pack_tmp_name);
869 870 871 872 873 874
			} else if (!last_mtime) {
				last_mtime = st.st_mtime;
			} else {
				struct utimbuf utb;
				utb.actime = st.st_atime;
				utb.modtime = --last_mtime;
875
				if (utime(pack_tmp_name, &utb) < 0)
876
					warning_errno("failed utime() on %s", pack_tmp_name);
877 878
			}

879
			strbuf_addf(&tmpname, "%s-", base_name);
880 881

			if (write_bitmap_index) {
882
				bitmap_writer_set_checksum(oid.hash);
883 884 885
				bitmap_writer_build_type_index(written_list, nr_written);
			}

886
			finish_tmp_packfile(&tmpname, pack_tmp_name,
887
					    written_list, nr_written,
888
					    &pack_idx_opts, oid.hash);
889 890

			if (write_bitmap_index) {
891
				strbuf_addf(&tmpname, "%s.bitmap", oid_to_hex(&oid));
892 893 894 895 896 897 898

				stop_progress(&progress_state);

				bitmap_writer_show_progress(progress);
				bitmap_writer_reuse_bitmaps(&to_pack);
				bitmap_writer_select_commits(indexed_commits, indexed_commits_nr, -1);
				bitmap_writer_build(&to_pack);
899
				bitmap_writer_finish(written_list, nr_written,
900
						     tmpname.buf, write_bitmap_options);
901 902 903
				write_bitmap_index = 0;
			}

904
			strbuf_release(&tmpname);
905
			free(pack_tmp_name);
906
			puts(oid_to_hex(&oid));
907 908 909 910
		}

		/* mark written objects as written to previous pack */
		for (j = 0; j < nr_written; j++) {
911
			written_list[j]->offset = (off_t)-1;
912 913
		}
		nr_remaining -= nr_written;
914
	} while (nr_remaining && i < to_pack.nr_objects);
915 916

	free(written_list);
917
	free(write_order);
N
Nicolas Pitre 已提交
918
	stop_progress(&progress_state);
919
	if (written != nr_result)
920 921
		die("wrote %"PRIu32" objects while expecting %"PRIu32,
			written, nr_result);
922 923
}

924 925
static int no_try_delta(const char *path)
{
926
	static struct attr_check *check;
927

928 929 930
	if (!check)
		check = attr_check_initl("delta", NULL);
	if (git_check_attr(path, check))
931
		return 0;
932
	if (ATTR_FALSE(check->items[0].value))
933 934 935 936
		return 1;
	return 0;
}

J
Jeff King 已提交
937 938 939 940 941 942 943 944 945 946
/*
 * When adding an object, check whether we have already added it
 * to our packing list. If so, we can skip. However, if we are
 * being asked to excludei t, but the previous mention was to include
 * it, make sure to adjust its flags and tweak our numbers accordingly.
 *
 * As an optimization, we pass out the index position where we would have
 * found the item, since that saves us from having to look it up again a
 * few lines later when we want to add the new entry.
 */
947
static int have_duplicate_entry(const struct object_id *oid,
J
Jeff King 已提交
948 949
				int exclude,
				uint32_t *index_pos)
950 951
{
	struct object_entry *entry;
N
Nicolas Pitre 已提交
952

953
	entry = packlist_find(&to_pack, oid->hash, index_pos);
J
Jeff King 已提交
954
	if (!entry)
N
Nicolas Pitre 已提交
955
		return 0;
J
Jeff King 已提交
956 957 958 959 960

	if (exclude) {
		if (!entry->preferred_base)
			nr_result--;
		entry->preferred_base = 1;
N
Nicolas Pitre 已提交
961
	}
962

J
Jeff King 已提交
963 964 965
	return 1;
}

966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986
static int want_found_object(int exclude, struct packed_git *p)
{
	if (exclude)
		return 1;
	if (incremental)
		return 0;

	/*
	 * When asked to do --local (do not include an object that appears in a
	 * pack we borrow from elsewhere) or --honor-pack-keep (do not include
	 * an object that appears in a pack marked with .keep), finding a pack
	 * that matches the criteria is sufficient for us to decide to omit it.
	 * However, even if this pack does not satisfy the criteria, we need to
	 * make sure no copy of this object appears in _any_ pack that makes us
	 * to omit the object, so we need to check all the packs.
	 *
	 * We can however first check whether these options can possible matter;
	 * if they do not matter we know we want the object in generated pack.
	 * Otherwise, we signal "-1" at the end to tell the caller that we do
	 * not know either way, and it needs to check more packs.
	 */
987 988
	if (!ignore_packed_keep_on_disk &&
	    !ignore_packed_keep_in_core &&
989 990 991 992 993
	    (!local || !have_non_local_packs))
		return 1;

	if (local && !p->pack_local)
		return 0;
994 995 996
	if (p->pack_local &&
	    ((ignore_packed_keep_on_disk && p->pack_keep) ||
	     (ignore_packed_keep_in_core && p->pack_keep_in_core)))
997 998 999 1000 1001 1002
		return 0;

	/* we don't know yet; keep looking for more packs */
	return -1;
}

J
Jeff King 已提交
1003 1004 1005 1006
/*
 * Check whether we want the object in the pack (e.g., we do not want
 * objects found in non-local stores if the "--local" option was used).
 *
1007 1008 1009 1010
 * If the caller already knows an existing pack it wants to take the object
 * from, that is passed in *found_pack and *found_offset; otherwise this
 * function finds if there is any pack that has the object and returns the pack
 * and its offset in these variables.
J
Jeff King 已提交
1011
 */
1012
static int want_object_in_pack(const struct object_id *oid,
J
Jeff King 已提交
1013 1014 1015 1016
			       int exclude,
			       struct packed_git **found_pack,
			       off_t *found_offset)
{
1017
	int want;
1018
	struct list_head *pos;
J
Jeff King 已提交
1019

1020
	if (!exclude && local && has_loose_object_nonlocal(oid->hash))
1021 1022
		return 0;

1023 1024 1025 1026 1027 1028 1029 1030 1031 1032
	/*
	 * If we already know the pack object lives in, start checks from that
	 * pack - in the usual case when neither --local was given nor .keep files
	 * are present we will determine the answer right now.
	 */
	if (*found_pack) {
		want = want_found_object(exclude, *found_pack);
		if (want != -1)
			return want;
	}
1033
	list_for_each(pos, get_packed_git_mru(the_repository)) {
1034
		struct packed_git *p = list_entry(pos, struct packed_git, mru);
1035 1036 1037 1038 1039
		off_t offset;

		if (p == *found_pack)
			offset = *found_offset;
		else
1040
			offset = find_pack_entry_one(oid->hash, p);
1041

1042
		if (offset) {
J
Jeff King 已提交
1043
			if (!*found_pack) {
1044
				if (!is_pack_valid(p))
1045
					continue;
J
Jeff King 已提交
1046 1047
				*found_offset = offset;
				*found_pack = p;
L
Linus Torvalds 已提交
1048
			}
1049
			want = want_found_object(exclude, p);
1050
			if (!exclude && want > 0)
1051 1052
				list_move(&p->mru,
					  get_packed_git_mru(the_repository));
1053 1054
			if (want != -1)
				return want;
L
Linus Torvalds 已提交
1055 1056
		}
	}
1057

J
Jeff King 已提交
1058 1059 1060
	return 1;
}

1061
static void create_object_entry(const struct object_id *oid,
J
Jeff King 已提交
1062 1063 1064 1065 1066 1067 1068 1069 1070
				enum object_type type,
				uint32_t hash,
				int exclude,
				int no_try_delta,
				uint32_t index_pos,
				struct packed_git *found_pack,
				off_t found_offset)
{
	struct object_entry *entry;
N
Nicolas Pitre 已提交
1071

1072
	entry = packlist_alloc(&to_pack, oid->hash, index_pos);
1073
	entry->hash = hash;
1074 1075
	if (type)
		entry->type = type;
N
Nicolas Pitre 已提交
1076 1077
	if (exclude)
		entry->preferred_base = 1;
1078 1079
	else
		nr_result++;
N
Nicolas Pitre 已提交
1080 1081 1082 1083
	if (found_pack) {
		entry->in_pack = found_pack;
		entry->in_pack_offset = found_offset;
	}
1084

J
Jeff King 已提交
1085 1086
	entry->no_try_delta = no_try_delta;
}
N
Nicolas Pitre 已提交
1087

1088 1089 1090 1091
static const char no_closure_warning[] = N_(
"disabling bitmap writing, as some objects are not being packed"
);

1092
static int add_object_entry(const struct object_id *oid, enum object_type type,
J
Jeff King 已提交
1093 1094
			    const char *name, int exclude)
{
1095 1096
	struct packed_git *found_pack = NULL;
	off_t found_offset = 0;
J
Jeff King 已提交
1097
	uint32_t index_pos;
1098

1099
	if (have_duplicate_entry(oid, exclude, &index_pos))
J
Jeff King 已提交
1100
		return 0;
1101

1102
	if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset)) {
1103 1104 1105 1106 1107
		/* The pack is missing an object, so it will not have closure */
		if (write_bitmap_index) {
			warning(_(no_closure_warning));
			write_bitmap_index = 0;
		}
J
Jeff King 已提交
1108
		return 0;
1109
	}
N
Nicolas Pitre 已提交
1110

1111
	create_object_entry(oid, type, pack_name_hash(name),
J
Jeff King 已提交
1112 1113
			    exclude, name && no_try_delta(name),
			    index_pos, found_pack, found_offset);
1114

1115
	display_progress(progress_state, nr_result);
N
Nicolas Pitre 已提交
1116
	return 1;
1117 1118
}

1119
static int add_object_entry_from_bitmap(const struct object_id *oid,
1120 1121 1122 1123 1124 1125
					enum object_type type,
					int flags, uint32_t name_hash,
					struct packed_git *pack, off_t offset)
{
	uint32_t index_pos;

1126
	if (have_duplicate_entry(oid, 0, &index_pos))
1127 1128
		return 0;

1129
	if (!want_object_in_pack(oid, 0, &pack, &offset))
1130 1131
		return 0;

1132
	create_object_entry(oid, type, name_hash, 0, 0, index_pos, pack, offset);
1133

1134
	display_progress(progress_state, nr_result);
N
Nicolas Pitre 已提交
1135
	return 1;
1136 1137
}

1138
struct pbase_tree_cache {
1139
	struct object_id oid;
1140 1141 1142 1143 1144 1145 1146
	int ref;
	int temporary;
	void *tree_data;
	unsigned long tree_size;
};

static struct pbase_tree_cache *(pbase_tree_cache[256]);
1147
static int pbase_tree_cache_ix(const struct object_id *oid)
1148
{
1149
	return oid->hash[0] % ARRAY_SIZE(pbase_tree_cache);
1150 1151 1152 1153 1154 1155 1156 1157 1158
}
static int pbase_tree_cache_ix_incr(int ix)
{
	return (ix+1) % ARRAY_SIZE(pbase_tree_cache);
}

static struct pbase_tree {
	struct pbase_tree *next;
	/* This is a phony "cache" entry; we are not
J
Justin Lebar 已提交
1159
	 * going to evict it or find it through _get()
1160 1161 1162 1163 1164 1165
	 * mechanism -- this is for the toplevel node that
	 * would almost always change with any commit.
	 */
	struct pbase_tree_cache pcache;
} *pbase_tree;

1166
static struct pbase_tree_cache *pbase_tree_get(const struct object_id *oid)
1167 1168 1169 1170
{
	struct pbase_tree_cache *ent, *nent;
	void *data;
	unsigned long size;
1171
	enum object_type type;
1172
	int neigh;
1173
	int my_ix = pbase_tree_cache_ix(oid);
1174 1175 1176 1177 1178 1179 1180 1181
	int available_ix = -1;

	/* pbase-tree-cache acts as a limited hashtable.
	 * your object will be found at your index or within a few
	 * slots after that slot if it is cached.
	 */
	for (neigh = 0; neigh < 8; neigh++) {
		ent = pbase_tree_cache[my_ix];
1182
		if (ent && !oidcmp(&ent->oid, oid)) {
1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197
			ent->ref++;
			return ent;
		}
		else if (((available_ix < 0) && (!ent || !ent->ref)) ||
			 ((0 <= available_ix) &&
			  (!ent && pbase_tree_cache[available_ix])))
			available_ix = my_ix;
		if (!ent)
			break;
		my_ix = pbase_tree_cache_ix_incr(my_ix);
	}

	/* Did not find one.  Either we got a bogus request or
	 * we need to read and perhaps cache.
	 */
1198
	data = read_object_file(oid, &type, &size);
1199 1200
	if (!data)
		return NULL;
1201
	if (type != OBJ_TREE) {
1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223
		free(data);
		return NULL;
	}

	/* We need to either cache or return a throwaway copy */

	if (available_ix < 0)
		ent = NULL;
	else {
		ent = pbase_tree_cache[available_ix];
		my_ix = available_ix;
	}

	if (!ent) {
		nent = xmalloc(sizeof(*nent));
		nent->temporary = (available_ix < 0);
	}
	else {
		/* evict and reuse */
		free(ent->tree_data);
		nent = ent;
	}
1224
	oidcpy(&nent->oid, oid);
1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252
	nent->tree_data = data;
	nent->tree_size = size;
	nent->ref = 1;
	if (!nent->temporary)
		pbase_tree_cache[my_ix] = nent;
	return nent;
}

static void pbase_tree_put(struct pbase_tree_cache *cache)
{
	if (!cache->temporary) {
		cache->ref--;
		return;
	}
	free(cache->tree_data);
	free(cache);
}

static int name_cmp_len(const char *name)
{
	int i;
	for (i = 0; name[i] && name[i] != '\n' && name[i] != '/'; i++)
		;
	return i;
}

static void add_pbase_object(struct tree_desc *tree,
			     const char *name,
1253 1254
			     int cmplen,
			     const char *fullname)
1255
{
1256
	struct name_entry entry;
1257
	int cmp;
1258 1259

	while (tree_entry(tree,&entry)) {
1260 1261
		if (S_ISGITLINK(entry.mode))
			continue;
1262
		cmp = tree_entry_len(&entry) != cmplen ? 1 :
1263 1264
		      memcmp(name, entry.path, cmplen);
		if (cmp > 0)
1265
			continue;
1266 1267
		if (cmp < 0)
			return;
1268
		if (name[cmplen] != '/') {
1269
			add_object_entry(entry.oid,
1270
					 object_type(entry.mode),
1271
					 fullname, 1);
1272 1273
			return;
		}
1274
		if (S_ISDIR(entry.mode)) {
1275
			struct tree_desc sub;
1276 1277 1278 1279
			struct pbase_tree_cache *tree;
			const char *down = name+cmplen+1;
			int downlen = name_cmp_len(down);

1280
			tree = pbase_tree_get(entry.oid);
1281 1282
			if (!tree)
				return;
1283
			init_tree_desc(&sub, tree->tree_data, tree->tree_size);
1284

1285
			add_pbase_object(&sub, down, downlen, fullname);
1286 1287 1288 1289
			pbase_tree_put(tree);
		}
	}
}
1290

1291 1292 1293 1294 1295 1296 1297 1298
static unsigned *done_pbase_paths;
static int done_pbase_paths_num;
static int done_pbase_paths_alloc;
static int done_pbase_path_pos(unsigned hash)
{
	int lo = 0;
	int hi = done_pbase_paths_num;
	while (lo < hi) {
1299
		int mi = lo + (hi - lo) / 2;
1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311
		if (done_pbase_paths[mi] == hash)
			return mi;
		if (done_pbase_paths[mi] < hash)
			hi = mi;
		else
			lo = mi + 1;
	}
	return -lo-1;
}

static int check_pbase_path(unsigned hash)
{
1312
	int pos = done_pbase_path_pos(hash);
1313 1314 1315
	if (0 <= pos)
		return 1;
	pos = -pos - 1;
1316 1317 1318
	ALLOC_GROW(done_pbase_paths,
		   done_pbase_paths_num + 1,
		   done_pbase_paths_alloc);
1319 1320
	done_pbase_paths_num++;
	if (pos < done_pbase_paths_num)
R
René Scharfe 已提交
1321 1322
		MOVE_ARRAY(done_pbase_paths + pos + 1, done_pbase_paths + pos,
			   done_pbase_paths_num - pos - 1);
1323 1324 1325 1326
	done_pbase_paths[pos] = hash;
	return 0;
}

1327
static void add_preferred_base_object(const char *name)
1328 1329
{
	struct pbase_tree *it;
1330
	int cmplen;
V
Vicent Marti 已提交
1331
	unsigned hash = pack_name_hash(name);
1332

1333
	if (!num_preferred_base || check_pbase_path(hash))
1334 1335
		return;

1336
	cmplen = name_cmp_len(name);
1337 1338
	for (it = pbase_tree; it; it = it->next) {
		if (cmplen == 0) {
1339
			add_object_entry(&it->pcache.oid, OBJ_TREE, NULL, 1);
1340 1341 1342
		}
		else {
			struct tree_desc tree;
1343
			init_tree_desc(&tree, it->pcache.tree_data, it->pcache.tree_size);
1344
			add_pbase_object(&tree, name, cmplen, name);
1345
		}
1346 1347 1348
	}
}

1349
static void add_preferred_base(struct object_id *oid)
1350
{
1351 1352 1353
	struct pbase_tree *it;
	void *data;
	unsigned long size;
1354
	struct object_id tree_oid;
1355

1356 1357 1358
	if (window <= num_preferred_base++)
		return;

1359
	data = read_object_with_reference(oid, tree_type, &size, &tree_oid);
1360
	if (!data)
1361
		return;
1362 1363

	for (it = pbase_tree; it; it = it->next) {
1364
		if (!oidcmp(&it->pcache.oid, &tree_oid)) {
1365 1366 1367 1368 1369 1370 1371 1372 1373
			free(data);
			return;
		}
	}

	it = xcalloc(1, sizeof(*it));
	it->next = pbase_tree;
	pbase_tree = it;

1374
	oidcpy(&it->pcache.oid, &tree_oid);
1375 1376
	it->pcache.tree_data = data;
	it->pcache.tree_size = size;
1377 1378
}

1379 1380 1381 1382 1383 1384 1385 1386
static void cleanup_preferred_base(void)
{
	struct pbase_tree *it;
	unsigned i;

	it = pbase_tree;
	pbase_tree = NULL;
	while (it) {
1387 1388 1389 1390
		struct pbase_tree *tmp = it;
		it = tmp->next;
		free(tmp->pcache.tree_data);
		free(tmp);
1391 1392 1393 1394 1395 1396
	}

	for (i = 0; i < ARRAY_SIZE(pbase_tree_cache); i++) {
		if (!pbase_tree_cache[i])
			continue;
		free(pbase_tree_cache[i]->tree_data);
1397
		FREE_AND_NULL(pbase_tree_cache[i]);
1398 1399
	}

1400
	FREE_AND_NULL(done_pbase_paths);
1401 1402 1403
	done_pbase_paths_num = done_pbase_paths_alloc = 0;
}

1404 1405
static void check_object(struct object_entry *entry)
{
1406
	if (entry->in_pack) {
1407
		struct packed_git *p = entry->in_pack;
1408
		struct pack_window *w_curs = NULL;
1409 1410 1411
		const unsigned char *base_ref = NULL;
		struct object_entry *base_entry;
		unsigned long used, used_0;
1412
		unsigned long avail;
1413 1414
		off_t ofs;
		unsigned char *buf, c;
1415

1416
		buf = use_pack(p, &w_curs, entry->in_pack_offset, &avail);
1417

1418
		/*
1419 1420
		 * We want in_pack_type even if we do not reuse delta
		 * since non-delta representations could still be reused.
1421
		 */
1422
		used = unpack_object_header_buffer(buf, avail,
1423 1424
						   &entry->in_pack_type,
						   &entry->size);
1425 1426
		if (used == 0)
			goto give_up;
1427

1428 1429 1430 1431
		/*
		 * Determine if this is a delta and if so whether we can
		 * reuse it or not.  Otherwise let's find out as cheaply as
		 * possible what the actual type and size for this object is.
1432
		 */
1433 1434 1435 1436 1437
		switch (entry->in_pack_type) {
		default:
			/* Not a delta hence we've already got all we need. */
			entry->type = entry->in_pack_type;
			entry->in_pack_header_size = used;
1438 1439
			if (entry->type < OBJ_COMMIT || entry->type > OBJ_BLOB)
				goto give_up;
1440 1441 1442
			unuse_pack(&w_curs);
			return;
		case OBJ_REF_DELTA:
1443
			if (reuse_delta && !entry->preferred_base)
1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455
				base_ref = use_pack(p, &w_curs,
						entry->in_pack_offset + used, NULL);
			entry->in_pack_header_size = used + 20;
			break;
		case OBJ_OFS_DELTA:
			buf = use_pack(p, &w_curs,
				       entry->in_pack_offset + used, NULL);
			used_0 = 0;
			c = buf[used_0++];
			ofs = c & 127;
			while (c & 128) {
				ofs += 1;
1456 1457
				if (!ofs || MSB(ofs, 7)) {
					error("delta base offset overflow in pack for %s",
1458
					      oid_to_hex(&entry->idx.oid));
1459 1460
					goto give_up;
				}
1461 1462
				c = buf[used_0++];
				ofs = (ofs << 7) + (c & 127);
1463
			}
1464
			ofs = entry->in_pack_offset - ofs;
1465 1466
			if (ofs <= 0 || ofs >= entry->in_pack_offset) {
				error("delta base offset out of bound for %s",
1467
				      oid_to_hex(&entry->idx.oid));
1468 1469
				goto give_up;
			}
1470
			if (reuse_delta && !entry->preferred_base) {
1471 1472
				struct revindex_entry *revidx;
				revidx = find_pack_revindex(p, ofs);
1473 1474
				if (!revidx)
					goto give_up;
1475 1476
				base_ref = nth_packed_object_sha1(p, revidx->nr);
			}
1477 1478
			entry->in_pack_header_size = used + used_0;
			break;
1479 1480
		}

1481
		if (base_ref && (base_entry = packlist_find(&to_pack, base_ref, NULL))) {
1482 1483 1484 1485 1486 1487 1488 1489 1490
			/*
			 * If base_ref was set above that means we wish to
			 * reuse delta data, and we even found that base
			 * in the list of objects we want to pack. Goodie!
			 *
			 * Depth value does not matter - find_deltas() will
			 * never consider reused delta as the base object to
			 * deltify other objects against, in order to avoid
			 * circular deltas.
1491
			 */
1492
			entry->type = entry->in_pack_type;
1493
			entry->delta = base_entry;
1494
			entry->delta_size = entry->size;
1495 1496
			entry->delta_sibling = base_entry->delta_child;
			base_entry->delta_child = entry;
1497 1498 1499
			unuse_pack(&w_curs);
			return;
		}
1500

1501 1502 1503 1504 1505 1506 1507 1508
		if (entry->type) {
			/*
			 * This must be a delta and we already know what the
			 * final object type is.  Let's extract the actual
			 * object size from the delta header.
			 */
			entry->size = get_size_from_delta(p, &w_curs,
					entry->in_pack_offset + entry->in_pack_header_size);
1509 1510
			if (entry->size == 0)
				goto give_up;
1511
			unuse_pack(&w_curs);
1512 1513
			return;
		}
1514 1515 1516 1517 1518 1519

		/*
		 * No choice but to fall back to the recursive delta walk
		 * with sha1_object_info() to find about the object type
		 * at this point...
		 */
1520
		give_up:
1521
		unuse_pack(&w_curs);
1522
	}
1523

1524
	entry->type = oid_object_info(&entry->idx.oid, &entry->size);
1525 1526 1527 1528 1529 1530
	/*
	 * The error condition is checked in prepare_pack().  This is
	 * to permit a missing preferred base object to be ignored
	 * as a preferred base.  Doing so can result in a larger
	 * pack file, but the transfer will still take place.
	 */
1531 1532
}

1533 1534 1535 1536 1537 1538 1539
static int pack_offset_sort(const void *_a, const void *_b)
{
	const struct object_entry *a = *(struct object_entry **)_a;
	const struct object_entry *b = *(struct object_entry **)_b;

	/* avoid filesystem trashing with loose objects */
	if (!a->in_pack && !b->in_pack)
1540
		return oidcmp(&a->idx.oid, &b->idx.oid);
1541 1542 1543 1544 1545 1546 1547 1548 1549

	if (a->in_pack < b->in_pack)
		return -1;
	if (a->in_pack > b->in_pack)
		return 1;
	return a->in_pack_offset < b->in_pack_offset ? -1 :
			(a->in_pack_offset > b->in_pack_offset);
}

1550 1551 1552 1553 1554 1555 1556 1557 1558 1559
/*
 * Drop an on-disk delta we were planning to reuse. Naively, this would
 * just involve blanking out the "delta" field, but we have to deal
 * with some extra book-keeping:
 *
 *   1. Removing ourselves from the delta_sibling linked list.
 *
 *   2. Updating our size/type to the non-delta representation. These were
 *      either not recorded initially (size) or overwritten with the delta type
 *      (type) when check_object() decided to reuse the delta.
1560 1561
 *
 *   3. Resetting our delta depth, as we are now a base object.
1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574
 */
static void drop_reused_delta(struct object_entry *entry)
{
	struct object_entry **p = &entry->delta->delta_child;
	struct object_info oi = OBJECT_INFO_INIT;

	while (*p) {
		if (*p == entry)
			*p = (*p)->delta_sibling;
		else
			p = &(*p)->delta_sibling;
	}
	entry->delta = NULL;
1575
	entry->depth = 0;
1576 1577 1578 1579 1580 1581 1582 1583 1584 1585

	oi.sizep = &entry->size;
	oi.typep = &entry->type;
	if (packed_object_info(entry->in_pack, entry->in_pack_offset, &oi) < 0) {
		/*
		 * We failed to get the info from this pack for some reason;
		 * fall back to sha1_object_info, which may find another copy.
		 * And if that fails, the error will be recorded in entry->type
		 * and dealt with in prepare_pack().
		 */
1586
		entry->type = oid_object_info(&entry->idx.oid, &entry->size);
1587 1588 1589 1590 1591 1592 1593
	}
}

/*
 * Follow the chain of deltas from this entry onward, throwing away any links
 * that cause us to hit a cycle (as determined by the DFS state flags in
 * the entries).
1594 1595 1596
 *
 * We also detect too-long reused chains that would violate our --depth
 * limit.
1597 1598 1599
 */
static void break_delta_chains(struct object_entry *entry)
{
1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620
	/*
	 * The actual depth of each object we will write is stored as an int,
	 * as it cannot exceed our int "depth" limit. But before we break
	 * changes based no that limit, we may potentially go as deep as the
	 * number of objects, which is elsewhere bounded to a uint32_t.
	 */
	uint32_t total_depth;
	struct object_entry *cur, *next;

	for (cur = entry, total_depth = 0;
	     cur;
	     cur = cur->delta, total_depth++) {
		if (cur->dfs_state == DFS_DONE) {
			/*
			 * We've already seen this object and know it isn't
			 * part of a cycle. We do need to append its depth
			 * to our count.
			 */
			total_depth += cur->depth;
			break;
		}
1621 1622

		/*
1623 1624 1625
		 * We break cycles before looping, so an ACTIVE state (or any
		 * other cruft which made its way into the state variable)
		 * is a bug.
1626
		 */
1627 1628 1629
		if (cur->dfs_state != DFS_NONE)
			die("BUG: confusing delta dfs state in first pass: %d",
			    cur->dfs_state);
1630 1631

		/*
1632 1633 1634
		 * Now we know this is the first time we've seen the object. If
		 * it's not a delta, we're done traversing, but we'll mark it
		 * done to save time on future traversals.
1635
		 */
1636 1637 1638 1639
		if (!cur->delta) {
			cur->dfs_state = DFS_DONE;
			break;
		}
1640 1641

		/*
1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656
		 * Mark ourselves as active and see if the next step causes
		 * us to cycle to another active object. It's important to do
		 * this _before_ we loop, because it impacts where we make the
		 * cut, and thus how our total_depth counter works.
		 * E.g., We may see a partial loop like:
		 *
		 *   A -> B -> C -> D -> B
		 *
		 * Cutting B->C breaks the cycle. But now the depth of A is
		 * only 1, and our total_depth counter is at 3. The size of the
		 * error is always one less than the size of the cycle we
		 * broke. Commits C and D were "lost" from A's chain.
		 *
		 * If we instead cut D->B, then the depth of A is correct at 3.
		 * We keep all commits in the chain that we examined.
1657
		 */
1658 1659 1660 1661 1662
		cur->dfs_state = DFS_ACTIVE;
		if (cur->delta->dfs_state == DFS_ACTIVE) {
			drop_reused_delta(cur);
			cur->dfs_state = DFS_DONE;
			break;
1663
		}
1664
	}
1665

1666 1667 1668 1669 1670 1671 1672 1673 1674
	/*
	 * And now that we've gone all the way to the bottom of the chain, we
	 * need to clear the active flags and set the depth fields as
	 * appropriate. Unlike the loop above, which can quit when it drops a
	 * delta, we need to keep going to look for more depth cuts. So we need
	 * an extra "next" pointer to keep going after we reset cur->delta.
	 */
	for (cur = entry; cur; cur = next) {
		next = cur->delta;
1675

1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686
		/*
		 * We should have a chain of zero or more ACTIVE states down to
		 * a final DONE. We can quit after the DONE, because either it
		 * has no bases, or we've already handled them in a previous
		 * call.
		 */
		if (cur->dfs_state == DFS_DONE)
			break;
		else if (cur->dfs_state != DFS_ACTIVE)
			die("BUG: confusing delta dfs state in second pass: %d",
			    cur->dfs_state);
1687 1688

		/*
1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704
		 * If the total_depth is more than depth, then we need to snip
		 * the chain into two or more smaller chains that don't exceed
		 * the maximum depth. Most of the resulting chains will contain
		 * (depth + 1) entries (i.e., depth deltas plus one base), and
		 * the last chain (i.e., the one containing entry) will contain
		 * whatever entries are left over, namely
		 * (total_depth % (depth + 1)) of them.
		 *
		 * Since we are iterating towards decreasing depth, we need to
		 * decrement total_depth as we go, and we need to write to the
		 * entry what its final depth will be after all of the
		 * snipping. Since we're snipping into chains of length (depth
		 * + 1) entries, the final depth of an entry will be its
		 * original depth modulo (depth + 1). Any time we encounter an
		 * entry whose final depth is supposed to be zero, we snip it
		 * from its delta base, thereby making it so.
1705
		 */
1706 1707 1708 1709 1710
		cur->depth = (total_depth--) % (depth + 1);
		if (!cur->depth)
			drop_reused_delta(cur);

		cur->dfs_state = DFS_DONE;
1711 1712 1713
	}
}

1714 1715
static void get_object_details(void)
{
1716
	uint32_t i;
1717 1718
	struct object_entry **sorted_by_offset;

1719 1720 1721
	sorted_by_offset = xcalloc(to_pack.nr_objects, sizeof(struct object_entry *));
	for (i = 0; i < to_pack.nr_objects; i++)
		sorted_by_offset[i] = to_pack.objects + i;
R
René Scharfe 已提交
1722
	QSORT(sorted_by_offset, to_pack.nr_objects, pack_offset_sort);
1723

1724
	for (i = 0; i < to_pack.nr_objects; i++) {
1725 1726
		struct object_entry *entry = sorted_by_offset[i];
		check_object(entry);
1727
		if (big_file_threshold < entry->size)
1728 1729
			entry->no_try_delta = 1;
	}
1730

1731 1732 1733 1734 1735 1736 1737
	/*
	 * This must happen in a second pass, since we rely on the delta
	 * information for the whole list being completed.
	 */
	for (i = 0; i < to_pack.nr_objects; i++)
		break_delta_chains(&to_pack.objects[i]);

1738
	free(sorted_by_offset);
1739 1740
}

1741 1742 1743 1744 1745 1746 1747 1748 1749
/*
 * We search for deltas in a list sorted by type, by filename hash, and then
 * by size, so that we see progressively smaller and smaller files.
 * That's because we prefer deltas to be from the bigger file
 * to the smaller -- deletes are potentially cheaper, but perhaps
 * more importantly, the bigger file is likely the more recent
 * one.  The deepest deltas are therefore the oldest objects which are
 * less susceptible to be accessed often.
 */
1750
static int type_size_sort(const void *_a, const void *_b)
1751
{
1752 1753 1754
	const struct object_entry *a = *(struct object_entry **)_a;
	const struct object_entry *b = *(struct object_entry **)_b;

1755
	if (a->type > b->type)
1756
		return -1;
1757
	if (a->type < b->type)
1758
		return 1;
1759
	if (a->hash > b->hash)
1760
		return -1;
1761
	if (a->hash < b->hash)
1762
		return 1;
1763
	if (a->preferred_base > b->preferred_base)
1764
		return -1;
1765 1766
	if (a->preferred_base < b->preferred_base)
		return 1;
1767
	if (a->size > b->size)
1768 1769
		return -1;
	if (a->size < b->size)
1770
		return 1;
1771
	return a < b ? -1 : (a > b);  /* newest first */
1772 1773 1774 1775 1776
}

struct unpacked {
	struct object_entry *entry;
	void *data;
1777
	struct delta_index *index;
1778
	unsigned depth;
1779 1780
};

1781 1782
static int delta_cacheable(unsigned long src_size, unsigned long trg_size,
			   unsigned long delta_size)
1783 1784 1785 1786
{
	if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size)
		return 0;

1787 1788 1789
	if (delta_size < cache_max_small_delta_size)
		return 1;

1790 1791 1792 1793 1794 1795 1796
	/* cache delta, if objects are large enough compared to delta size */
	if ((src_size >> 20) + (trg_size >> 21) > (delta_size >> 10))
		return 1;

	return 0;
}

1797
#ifndef NO_PTHREADS
N
Nicolas Pitre 已提交
1798

1799
static pthread_mutex_t read_mutex;
N
Nicolas Pitre 已提交
1800 1801 1802
#define read_lock()		pthread_mutex_lock(&read_mutex)
#define read_unlock()		pthread_mutex_unlock(&read_mutex)

1803
static pthread_mutex_t cache_mutex;
1804 1805 1806
#define cache_lock()		pthread_mutex_lock(&cache_mutex)
#define cache_unlock()		pthread_mutex_unlock(&cache_mutex)

1807
static pthread_mutex_t progress_mutex;
N
Nicolas Pitre 已提交
1808 1809 1810 1811 1812
#define progress_lock()		pthread_mutex_lock(&progress_mutex)
#define progress_unlock()	pthread_mutex_unlock(&progress_mutex)

#else

1813 1814 1815 1816 1817 1818
#define read_lock()		(void)0
#define read_unlock()		(void)0
#define cache_lock()		(void)0
#define cache_unlock()		(void)0
#define progress_lock()		(void)0
#define progress_unlock()	(void)0
N
Nicolas Pitre 已提交
1819 1820 1821

#endif

1822
static int try_delta(struct unpacked *trg, struct unpacked *src,
1823
		     unsigned max_depth, unsigned long *mem_usage)
1824
{
1825 1826
	struct object_entry *trg_entry = trg->entry;
	struct object_entry *src_entry = src->entry;
1827
	unsigned long trg_size, src_size, delta_size, sizediff, max_size, sz;
1828
	unsigned ref_depth;
1829
	enum object_type type;
1830 1831 1832
	void *delta_buf;

	/* Don't bother doing diffs between different types */
1833
	if (trg_entry->type != src_entry->type)
1834 1835
		return -1;

1836
	/*
1837 1838 1839 1840 1841 1842
	 * We do not bother to try a delta that we discarded on an
	 * earlier try, but only when reusing delta data.  Note that
	 * src_entry that is marked as the preferred_base should always
	 * be considered, as even if we produce a suboptimal delta against
	 * it, we will still save the transfer cost, as we already know
	 * the other side has it and we won't send src_entry at all.
1843
	 */
1844
	if (reuse_delta && trg_entry->in_pack &&
1845
	    trg_entry->in_pack == src_entry->in_pack &&
1846
	    !src_entry->preferred_base &&
1847 1848
	    trg_entry->in_pack_type != OBJ_REF_DELTA &&
	    trg_entry->in_pack_type != OBJ_OFS_DELTA)
1849 1850
		return 0;

1851
	/* Let's not bust the allowed depth. */
1852
	if (src->depth >= max_depth)
1853
		return 0;
1854

1855
	/* Now some size filtering heuristics. */
1856
	trg_size = trg_entry->size;
1857 1858 1859 1860 1861
	if (!trg_entry->delta) {
		max_size = trg_size/2 - 20;
		ref_depth = 1;
	} else {
		max_size = trg_entry->delta_size;
1862
		ref_depth = trg->depth;
1863
	}
1864
	max_size = (uint64_t)max_size * (max_depth - src->depth) /
1865
						(max_depth - ref_depth + 1);
1866 1867
	if (max_size == 0)
		return 0;
1868
	src_size = src_entry->size;
1869
	sizediff = src_size < trg_size ? trg_size - src_size : 0;
1870
	if (sizediff >= max_size)
1871
		return 0;
1872 1873
	if (trg_size < src_size / 32)
		return 0;
1874

1875 1876
	/* Load data if not already done */
	if (!trg->data) {
N
Nicolas Pitre 已提交
1877
		read_lock();
1878
		trg->data = read_object_file(&trg_entry->idx.oid, &type, &sz);
N
Nicolas Pitre 已提交
1879
		read_unlock();
1880 1881
		if (!trg->data)
			die("object %s cannot be read",
1882
			    oid_to_hex(&trg_entry->idx.oid));
1883 1884
		if (sz != trg_size)
			die("object %s inconsistent object length (%lu vs %lu)",
1885 1886
			    oid_to_hex(&trg_entry->idx.oid), sz,
			    trg_size);
1887
		*mem_usage += sz;
1888 1889
	}
	if (!src->data) {
N
Nicolas Pitre 已提交
1890
		read_lock();
1891
		src->data = read_object_file(&src_entry->idx.oid, &type, &sz);
N
Nicolas Pitre 已提交
1892
		read_unlock();
1893 1894 1895 1896 1897
		if (!src->data) {
			if (src_entry->preferred_base) {
				static int warned = 0;
				if (!warned++)
					warning("object %s cannot be read",
1898
						oid_to_hex(&src_entry->idx.oid));
1899 1900 1901 1902 1903 1904 1905 1906
				/*
				 * Those objects are not included in the
				 * resulting pack.  Be resilient and ignore
				 * them if they can't be read, in case the
				 * pack could be created nevertheless.
				 */
				return 0;
			}
1907
			die("object %s cannot be read",
1908
			    oid_to_hex(&src_entry->idx.oid));
1909
		}
1910 1911
		if (sz != src_size)
			die("object %s inconsistent object length (%lu vs %lu)",
1912 1913
			    oid_to_hex(&src_entry->idx.oid), sz,
			    src_size);
1914
		*mem_usage += sz;
1915 1916 1917
	}
	if (!src->index) {
		src->index = create_delta_index(src->data, src_size);
1918 1919 1920 1921 1922 1923
		if (!src->index) {
			static int warned = 0;
			if (!warned++)
				warning("suboptimal pack - out of memory");
			return 0;
		}
1924
		*mem_usage += sizeof_delta_index(src->index);
1925 1926 1927
	}

	delta_buf = create_delta(src->index, trg->data, trg_size, &delta_size, max_size);
1928
	if (!delta_buf)
1929
		return 0;
1930

N
Nicolas Pitre 已提交
1931
	if (trg_entry->delta) {
1932 1933
		/* Prefer only shallower same-sized deltas. */
		if (delta_size == trg_entry->delta_size &&
1934
		    src->depth + 1 >= trg->depth) {
1935 1936 1937
			free(delta_buf);
			return 0;
		}
1938
	}
N
Nicolas Pitre 已提交
1939

1940 1941 1942
	/*
	 * Handle memory allocation outside of the cache
	 * accounting lock.  Compiler will optimize the strangeness
1943
	 * away when NO_PTHREADS is defined.
1944
	 */
1945
	free(trg_entry->delta_data);
1946
	cache_lock();
N
Nicolas Pitre 已提交
1947 1948 1949 1950
	if (trg_entry->delta_data) {
		delta_cache_size -= trg_entry->delta_size;
		trg_entry->delta_data = NULL;
	}
1951
	if (delta_cacheable(src_size, trg_size, delta_size)) {
1952
		delta_cache_size += delta_size;
1953 1954 1955 1956
		cache_unlock();
		trg_entry->delta_data = xrealloc(delta_buf, delta_size);
	} else {
		cache_unlock();
1957
		free(delta_buf);
1958 1959
	}

1960 1961 1962 1963
	trg_entry->delta = src_entry;
	trg_entry->delta_size = delta_size;
	trg->depth = src->depth + 1;

1964
	return 1;
1965 1966
}

1967
static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
1968
{
1969 1970 1971 1972 1973 1974 1975 1976 1977
	struct object_entry *child = me->delta_child;
	unsigned int m = n;
	while (child) {
		unsigned int c = check_delta_limit(child, n + 1);
		if (m < c)
			m = c;
		child = child->delta_sibling;
	}
	return m;
1978 1979
}

1980
static unsigned long free_unpacked(struct unpacked *n)
1981
{
1982
	unsigned long freed_mem = sizeof_delta_index(n->index);
1983 1984 1985
	free_delta_index(n->index);
	n->index = NULL;
	if (n->data) {
1986
		freed_mem += n->entry->size;
1987
		FREE_AND_NULL(n->data);
1988 1989
	}
	n->entry = NULL;
1990
	n->depth = 0;
1991
	return freed_mem;
1992 1993
}

1994
static void find_deltas(struct object_entry **list, unsigned *list_size,
1995
			int window, int depth, unsigned *processed)
1996
{
1997
	uint32_t i, idx = 0, count = 0;
1998
	struct unpacked *array;
1999
	unsigned long mem_usage = 0;
2000

2001
	array = xcalloc(window, sizeof(struct unpacked));
2002

2003
	for (;;) {
2004
		struct object_entry *entry;
2005
		struct unpacked *n = array + idx;
2006
		int j, max_depth, best_base = -1;
2007

2008 2009 2010 2011 2012
		progress_lock();
		if (!*list_size) {
			progress_unlock();
			break;
		}
2013
		entry = *list++;
2014 2015 2016 2017 2018 2019 2020
		(*list_size)--;
		if (!entry->preferred_base) {
			(*processed)++;
			display_progress(progress_state, *processed);
		}
		progress_unlock();

2021
		mem_usage -= free_unpacked(n);
2022
		n->entry = entry;
2023

2024
		while (window_memory_limit &&
2025
		       mem_usage > window_memory_limit &&
2026 2027
		       count > 1) {
			uint32_t tail = (idx + window - count) % window;
2028
			mem_usage -= free_unpacked(array + tail);
2029 2030 2031
			count--;
		}

2032 2033 2034 2035 2036 2037
		/* We do not compute delta to *create* objects we are not
		 * going to pack.
		 */
		if (entry->preferred_base)
			goto next;

2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049
		/*
		 * If the current object is at pack edge, take the depth the
		 * objects that depend on the current object into account
		 * otherwise they would become too deep.
		 */
		max_depth = depth;
		if (entry->delta_child) {
			max_depth -= check_delta_limit(entry, 0);
			if (max_depth <= 0)
				goto next;
		}

L
Linus Torvalds 已提交
2050 2051
		j = window;
		while (--j > 0) {
2052
			int ret;
2053
			uint32_t other_idx = idx + j;
2054
			struct unpacked *m;
L
Linus Torvalds 已提交
2055 2056
			if (other_idx >= window)
				other_idx -= window;
2057 2058 2059
			m = array + other_idx;
			if (!m->entry)
				break;
2060
			ret = try_delta(n, m, max_depth, &mem_usage);
2061
			if (ret < 0)
2062
				break;
2063 2064
			else if (ret > 0)
				best_base = other_idx;
2065
		}
2066

2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089
		/*
		 * If we decided to cache the delta data, then it is best
		 * to compress it right away.  First because we have to do
		 * it anyway, and doing it here while we're threaded will
		 * save a lot of time in the non threaded write phase,
		 * as well as allow for caching more deltas within
		 * the same cache size limit.
		 * ...
		 * But only if not writing to stdout, since in that case
		 * the network is most likely throttling writes anyway,
		 * and therefore it is best to go to the write phase ASAP
		 * instead, as we can afford spending more time compressing
		 * between writes at that moment.
		 */
		if (entry->delta_data && !pack_to_stdout) {
			entry->z_delta_size = do_compress(&entry->delta_data,
							  entry->delta_size);
			cache_lock();
			delta_cache_size -= entry->delta_size;
			delta_cache_size += entry->z_delta_size;
			cache_unlock();
		}

2090 2091 2092 2093
		/* if we made n a delta, and if n is already at max
		 * depth, leaving it in the window is pointless.  we
		 * should evict it first.
		 */
2094
		if (entry->delta && max_depth <= n->depth)
2095
			continue;
2096

2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113
		/*
		 * Move the best delta base up in the window, after the
		 * currently deltified object, to keep it longer.  It will
		 * be the first base object to be attempted next.
		 */
		if (entry->delta) {
			struct unpacked swap = array[best_base];
			int dist = (window + idx - best_base) % window;
			int dst = best_base;
			while (dist--) {
				int src = (dst + 1) % window;
				array[dst] = array[src];
				dst = src;
			}
			array[dst] = swap;
		}

2114
		next:
2115
		idx++;
2116 2117
		if (count + 1 < window)
			count++;
2118 2119
		if (idx >= window)
			idx = 0;
2120
	}
2121

2122
	for (i = 0; i < window; ++i) {
2123
		free_delta_index(array[i].index);
2124
		free(array[i].data);
2125
	}
2126
	free(array);
2127 2128
}

2129
#ifndef NO_PTHREADS
N
Nicolas Pitre 已提交
2130

2131 2132 2133
static void try_to_free_from_threads(size_t size)
{
	read_lock();
2134
	release_pack_memory(size);
2135 2136 2137
	read_unlock();
}

2138
static try_to_free_t old_try_to_free_routine;
2139

2140 2141 2142 2143 2144 2145 2146 2147 2148
/*
 * The main thread waits on the condition that (at least) one of the workers
 * has stopped working (which is indicated in the .working member of
 * struct thread_params).
 * When a work thread has completed its work, it sets .working to 0 and
 * signals the main thread and waits on the condition that .data_ready
 * becomes 1.
 */

N
Nicolas Pitre 已提交
2149 2150 2151 2152
struct thread_params {
	pthread_t thread;
	struct object_entry **list;
	unsigned list_size;
2153
	unsigned remaining;
N
Nicolas Pitre 已提交
2154 2155
	int window;
	int depth;
2156 2157 2158 2159
	int working;
	int data_ready;
	pthread_mutex_t mutex;
	pthread_cond_t cond;
N
Nicolas Pitre 已提交
2160 2161 2162
	unsigned *processed;
};

2163 2164 2165 2166 2167 2168 2169
static pthread_cond_t progress_cond;

/*
 * Mutex and conditional variable can't be statically-initialized on Windows.
 */
static void init_threaded_search(void)
{
2170
	init_recursive_mutex(&read_mutex);
2171 2172 2173
	pthread_mutex_init(&cache_mutex, NULL);
	pthread_mutex_init(&progress_mutex, NULL);
	pthread_cond_init(&progress_cond, NULL);
2174
	old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
2175 2176 2177 2178
}

static void cleanup_threaded_search(void)
{
2179
	set_try_to_free_routine(old_try_to_free_routine);
2180 2181 2182 2183 2184
	pthread_cond_destroy(&progress_cond);
	pthread_mutex_destroy(&read_mutex);
	pthread_mutex_destroy(&cache_mutex);
	pthread_mutex_destroy(&progress_mutex);
}
2185

N
Nicolas Pitre 已提交
2186 2187
static void *threaded_find_deltas(void *arg)
{
2188 2189
	struct thread_params *me = arg;

2190
	progress_lock();
2191
	while (me->remaining) {
2192 2193
		progress_unlock();

2194
		find_deltas(me->list, &me->remaining,
2195
			    me->window, me->depth, me->processed);
2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214

		progress_lock();
		me->working = 0;
		pthread_cond_signal(&progress_cond);
		progress_unlock();

		/*
		 * We must not set ->data_ready before we wait on the
		 * condition because the main thread may have set it to 1
		 * before we get here. In order to be sure that new
		 * work is available if we see 1 in ->data_ready, it
		 * was initialized to 0 before this thread was spawned
		 * and we reset it to 0 right away.
		 */
		pthread_mutex_lock(&me->mutex);
		while (!me->data_ready)
			pthread_cond_wait(&me->cond, &me->mutex);
		me->data_ready = 0;
		pthread_mutex_unlock(&me->mutex);
2215 2216

		progress_lock();
2217
	}
2218
	progress_unlock();
2219 2220
	/* leave ->working 1 so that this doesn't get more work assigned */
	return NULL;
N
Nicolas Pitre 已提交
2221 2222 2223 2224 2225
}

static void ll_find_deltas(struct object_entry **list, unsigned list_size,
			   int window, int depth, unsigned *processed)
{
2226
	struct thread_params *p;
2227
	int i, ret, active_threads = 0;
2228

2229 2230
	init_threaded_search();

2231
	if (delta_search_threads <= 1) {
2232
		find_deltas(list, &list_size, window, depth, processed);
2233
		cleanup_threaded_search();
2234 2235
		return;
	}
2236
	if (progress > pack_to_stdout)
2237
		fprintf(stderr, "Delta compression using up to %d threads.\n",
2238
				delta_search_threads);
2239
	p = xcalloc(delta_search_threads, sizeof(*p));
2240

2241
	/* Partition the work amongst work threads. */
2242
	for (i = 0; i < delta_search_threads; i++) {
2243 2244
		unsigned sub_size = list_size / (delta_search_threads - i);

2245 2246 2247 2248
		/* don't use too small segments or no deltas will be found */
		if (sub_size < 2*window && i+1 < delta_search_threads)
			sub_size = 0;

N
Nicolas Pitre 已提交
2249 2250 2251
		p[i].window = window;
		p[i].depth = depth;
		p[i].processed = processed;
2252 2253
		p[i].working = 1;
		p[i].data_ready = 0;
2254

2255
		/* try to split chunks on "path" boundaries */
2256 2257
		while (sub_size && sub_size < list_size &&
		       list[sub_size]->hash &&
2258 2259 2260
		       list[sub_size]->hash == list[sub_size-1]->hash)
			sub_size++;

2261 2262 2263
		p[i].list = list;
		p[i].list_size = sub_size;
		p[i].remaining = sub_size;
2264

2265 2266 2267 2268
		list += sub_size;
		list_size -= sub_size;
	}

2269 2270 2271 2272
	/* Start work threads. */
	for (i = 0; i < delta_search_threads; i++) {
		if (!p[i].list_size)
			continue;
2273 2274
		pthread_mutex_init(&p[i].mutex, NULL);
		pthread_cond_init(&p[i].cond, NULL);
2275 2276 2277 2278 2279 2280 2281
		ret = pthread_create(&p[i].thread, NULL,
				     threaded_find_deltas, &p[i]);
		if (ret)
			die("unable to create thread: %s", strerror(ret));
		active_threads++;
	}

2282 2283 2284 2285 2286 2287 2288 2289
	/*
	 * Now let's wait for work completion.  Each time a thread is done
	 * with its work, we steal half of the remaining work from the
	 * thread with the largest number of unprocessed objects and give
	 * it to that newly idle thread.  This ensure good load balancing
	 * until the remaining object list segments are simply too short
	 * to be worth splitting anymore.
	 */
2290 2291
	while (active_threads) {
		struct thread_params *target = NULL;
2292 2293 2294 2295
		struct thread_params *victim = NULL;
		unsigned sub_size = 0;

		progress_lock();
2296 2297 2298 2299 2300 2301 2302 2303 2304
		for (;;) {
			for (i = 0; !target && i < delta_search_threads; i++)
				if (!p[i].working)
					target = &p[i];
			if (target)
				break;
			pthread_cond_wait(&progress_cond, &progress_mutex);
		}

2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316
		for (i = 0; i < delta_search_threads; i++)
			if (p[i].remaining > 2*window &&
			    (!victim || victim->remaining < p[i].remaining))
				victim = &p[i];
		if (victim) {
			sub_size = victim->remaining / 2;
			list = victim->list + victim->list_size - sub_size;
			while (sub_size && list[0]->hash &&
			       list[0]->hash == list[-1]->hash) {
				list++;
				sub_size--;
			}
2317 2318 2319 2320 2321 2322 2323 2324 2325 2326
			if (!sub_size) {
				/*
				 * It is possible for some "paths" to have
				 * so many objects that no hash boundary
				 * might be found.  Let's just steal the
				 * exact half in that case.
				 */
				sub_size = victim->remaining / 2;
				list -= sub_size;
			}
2327 2328 2329 2330 2331 2332
			target->list = list;
			victim->list_size -= sub_size;
			victim->remaining -= sub_size;
		}
		target->list_size = sub_size;
		target->remaining = sub_size;
2333 2334 2335 2336 2337 2338 2339
		target->working = 1;
		progress_unlock();

		pthread_mutex_lock(&target->mutex);
		target->data_ready = 1;
		pthread_cond_signal(&target->cond);
		pthread_mutex_unlock(&target->mutex);
2340

2341
		if (!sub_size) {
2342
			pthread_join(target->thread, NULL);
2343 2344
			pthread_cond_destroy(&target->cond);
			pthread_mutex_destroy(&target->mutex);
2345
			active_threads--;
2346
		}
2347
	}
2348
	cleanup_threaded_search();
2349
	free(p);
N
Nicolas Pitre 已提交
2350 2351 2352
}

#else
2353
#define ll_find_deltas(l, s, w, d, p)	find_deltas(l, &s, w, d, p)
N
Nicolas Pitre 已提交
2354 2355
#endif

2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369
static void add_tag_chain(const struct object_id *oid)
{
	struct tag *tag;

	/*
	 * We catch duplicates already in add_object_entry(), but we'd
	 * prefer to do this extra check to avoid having to parse the
	 * tag at all if we already know that it's being packed (e.g., if
	 * it was included via bitmaps, we would not have parsed it
	 * previously).
	 */
	if (packlist_find(&to_pack, oid->hash, NULL))
		return;

2370
	tag = lookup_tag(oid);
2371 2372 2373 2374 2375
	while (1) {
		if (!tag || parse_tag(tag) || !tag->tagged)
			die("unable to pack objects reachable from tag %s",
			    oid_to_hex(oid));

2376
		add_object_entry(&tag->object.oid, OBJ_TAG, NULL, 0);
2377 2378 2379 2380 2381 2382 2383 2384

		if (tag->tagged->type != OBJ_TAG)
			return;

		tag = (struct tag *)tag->tagged;
	}
}

2385
static int add_ref_tag(const char *path, const struct object_id *oid, int flag, void *cb_data)
2386
{
2387
	struct object_id peeled;
2388

2389
	if (starts_with(path, "refs/tags/") && /* is a tag? */
2390
	    !peel_ref(path, &peeled)    && /* peelable? */
2391
	    packlist_find(&to_pack, peeled.hash, NULL))      /* object packed? */
2392
		add_tag_chain(oid);
2393 2394 2395
	return 0;
}

2396 2397
static void prepare_pack(int window, int depth)
{
2398
	struct object_entry **delta_list;
2399 2400
	uint32_t i, nr_deltas;
	unsigned n;
2401

2402
	get_object_details();
2403

2404 2405 2406 2407 2408 2409 2410 2411 2412 2413
	/*
	 * If we're locally repacking then we need to be doubly careful
	 * from now on in order to make sure no stealth corruption gets
	 * propagated to the new pack.  Clients receiving streamed packs
	 * should validate everything they get anyway so no need to incur
	 * the additional cost here in that case.
	 */
	if (!pack_to_stdout)
		do_check_packed_object_crc = 1;

2414
	if (!to_pack.nr_objects || !window || !depth)
2415 2416
		return;

J
Jeff King 已提交
2417
	ALLOC_ARRAY(delta_list, to_pack.nr_objects);
2418 2419
	nr_deltas = n = 0;

2420 2421
	for (i = 0; i < to_pack.nr_objects; i++) {
		struct object_entry *entry = to_pack.objects + i;
2422 2423 2424

		if (entry->delta)
			/* This happens if we decided to reuse existing
2425
			 * delta from a pack.  "reuse_delta &&" is implied.
2426 2427 2428 2429 2430 2431 2432 2433 2434
			 */
			continue;

		if (entry->size < 50)
			continue;

		if (entry->no_try_delta)
			continue;

2435
		if (!entry->preferred_base) {
2436
			nr_deltas++;
2437 2438
			if (entry->type < 0)
				die("unable to get type of object %s",
2439
				    oid_to_hex(&entry->idx.oid));
2440 2441 2442 2443 2444 2445 2446 2447
		} else {
			if (entry->type < 0) {
				/*
				 * This object is not found, but we
				 * don't have to include it anyway.
				 */
				continue;
			}
2448
		}
2449 2450 2451 2452

		delta_list[n++] = entry;
	}

2453
	if (nr_deltas && n > 1) {
2454 2455
		unsigned nr_done = 0;
		if (progress)
2456
			progress_state = start_progress(_("Compressing objects"),
2457
							nr_deltas);
R
René Scharfe 已提交
2458
		QSORT(delta_list, n, type_size_sort);
N
Nicolas Pitre 已提交
2459
		ll_find_deltas(delta_list, n, window+1, depth, &nr_done);
N
Nicolas Pitre 已提交
2460
		stop_progress(&progress_state);
2461 2462
		if (nr_done != nr_deltas)
			die("inconsistency with delta count");
2463
	}
2464
	free(delta_list);
2465 2466
}

2467
static int git_pack_config(const char *k, const char *v, void *cb)
2468
{
2469
	if (!strcmp(k, "pack.window")) {
2470 2471 2472
		window = git_config_int(k, v);
		return 0;
	}
2473 2474 2475 2476 2477
	if (!strcmp(k, "pack.windowmemory")) {
		window_memory_limit = git_config_ulong(k, v);
		return 0;
	}
	if (!strcmp(k, "pack.depth")) {
2478 2479 2480
		depth = git_config_int(k, v);
		return 0;
	}
2481 2482 2483 2484
	if (!strcmp(k, "pack.deltacachesize")) {
		max_delta_cache_size = git_config_int(k, v);
		return 0;
	}
2485 2486 2487 2488
	if (!strcmp(k, "pack.deltacachelimit")) {
		cache_max_small_delta_size = git_config_int(k, v);
		return 0;
	}
2489 2490 2491 2492 2493 2494
	if (!strcmp(k, "pack.writebitmaphashcache")) {
		if (git_config_bool(k, v))
			write_bitmap_options |= BITMAP_OPT_HASH_CACHE;
		else
			write_bitmap_options &= ~BITMAP_OPT_HASH_CACHE;
	}
2495
	if (!strcmp(k, "pack.usebitmaps")) {
2496
		use_bitmap_index_default = git_config_bool(k, v);
2497 2498
		return 0;
	}
2499 2500
	if (!strcmp(k, "pack.threads")) {
		delta_search_threads = git_config_int(k, v);
2501
		if (delta_search_threads < 0)
2502 2503
			die("invalid number of threads specified (%d)",
			    delta_search_threads);
2504
#ifdef NO_PTHREADS
2505
		if (delta_search_threads != 1) {
2506
			warning("no threads support, ignoring %s", k);
2507 2508
			delta_search_threads = 0;
		}
2509 2510 2511
#endif
		return 0;
	}
2512
	if (!strcmp(k, "pack.indexversion")) {
2513 2514
		pack_idx_opts.version = git_config_int(k, v);
		if (pack_idx_opts.version > 2)
2515
			die("bad pack.indexversion=%"PRIu32,
2516
			    pack_idx_opts.version);
2517 2518
		return 0;
	}
2519
	return git_default_config(k, v, cb);
2520 2521
}

2522
static void read_object_list_from_stdin(void)
2523
{
2524 2525 2526
	char line[GIT_MAX_HEXSZ + 1 + PATH_MAX + 2];
	struct object_id oid;
	const char *p;
2527

2528 2529 2530 2531 2532 2533
	for (;;) {
		if (!fgets(line, sizeof(line), stdin)) {
			if (feof(stdin))
				break;
			if (!ferror(stdin))
				die("fgets returned NULL, not EOF, not error!");
2534
			if (errno != EINTR)
2535
				die_errno("fgets");
2536 2537
			clearerr(stdin);
			continue;
2538
		}
2539
		if (line[0] == '-') {
2540 2541
			if (get_oid_hex(line+1, &oid))
				die("expected edge object ID, got garbage:\n %s",
2542
				    line);
2543
			add_preferred_base(&oid);
2544
			continue;
2545
		}
2546 2547
		if (parse_oid_hex(line, &oid, &p))
			die("expected object ID, got garbage:\n %s", line);
2548

2549 2550
		add_preferred_base_object(p + 1);
		add_object_entry(&oid, 0, p + 1, 0);
2551
	}
2552 2553
}

2554
/* Remember to update object flag allocation in object.h */
J
Junio C Hamano 已提交
2555 2556
#define OBJECT_ADDED (1u<<20)

2557
static void show_commit(struct commit *commit, void *data)
2558
{
2559
	add_object_entry(&commit->object.oid, OBJ_COMMIT, NULL, 0);
J
Junio C Hamano 已提交
2560
	commit->object.flags |= OBJECT_ADDED;
2561 2562 2563

	if (write_bitmap_index)
		index_commit_for_bitmap(commit);
2564 2565
}

2566
static void show_object(struct object *obj, const char *name, void *data)
2567
{
2568
	add_preferred_base_object(name);
2569
	add_object_entry(&obj->oid, obj->type, name, 0);
2570
	obj->flags |= OBJECT_ADDED;
2571 2572
}

2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586
static void show_object__ma_allow_any(struct object *obj, const char *name, void *data)
{
	assert(arg_missing_action == MA_ALLOW_ANY);

	/*
	 * Quietly ignore ALL missing objects.  This avoids problems with
	 * staging them now and getting an odd error later.
	 */
	if (!has_object_file(&obj->oid))
		return;

	show_object(obj, name, data);
}

2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600
static void show_object__ma_allow_promisor(struct object *obj, const char *name, void *data)
{
	assert(arg_missing_action == MA_ALLOW_PROMISOR);

	/*
	 * Quietly ignore EXPECTED missing objects.  This avoids problems with
	 * staging them now and getting an odd error later.
	 */
	if (!has_object_file(&obj->oid) && is_promisor_object(&obj->oid))
		return;

	show_object(obj, name, data);
}

2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614
static int option_parse_missing_action(const struct option *opt,
				       const char *arg, int unset)
{
	assert(arg);
	assert(!unset);

	if (!strcmp(arg, "error")) {
		arg_missing_action = MA_ERROR;
		fn_show_object = show_object;
		return 0;
	}

	if (!strcmp(arg, "allow-any")) {
		arg_missing_action = MA_ALLOW_ANY;
2615
		fetch_if_missing = 0;
2616 2617 2618 2619
		fn_show_object = show_object__ma_allow_any;
		return 0;
	}

2620 2621 2622 2623 2624 2625 2626
	if (!strcmp(arg, "allow-promisor")) {
		arg_missing_action = MA_ALLOW_PROMISOR;
		fetch_if_missing = 0;
		fn_show_object = show_object__ma_allow_promisor;
		return 0;
	}

2627 2628 2629 2630
	die(_("invalid value for --missing"));
	return 0;
}

2631 2632
static void show_edge(struct commit *commit)
{
2633
	add_preferred_base(&commit->object.oid);
2634 2635
}

J
Junio C Hamano 已提交
2636 2637 2638 2639 2640 2641
struct in_pack_object {
	off_t offset;
	struct object *object;
};

struct in_pack {
2642 2643
	unsigned int alloc;
	unsigned int nr;
J
Junio C Hamano 已提交
2644 2645 2646 2647 2648
	struct in_pack_object *array;
};

static void mark_in_pack_object(struct object *object, struct packed_git *p, struct in_pack *in_pack)
{
B
brian m. carlson 已提交
2649
	in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->oid.hash, p);
J
Junio C Hamano 已提交
2650 2651 2652 2653 2654 2655
	in_pack->array[in_pack->nr].object = object;
	in_pack->nr++;
}

/*
 * Compare the objects in the offset order, in order to emulate the
2656
 * "git rev-list --objects" output that produced the pack originally.
J
Junio C Hamano 已提交
2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667
 */
static int ofscmp(const void *a_, const void *b_)
{
	struct in_pack_object *a = (struct in_pack_object *)a_;
	struct in_pack_object *b = (struct in_pack_object *)b_;

	if (a->offset < b->offset)
		return -1;
	else if (a->offset > b->offset)
		return 1;
	else
2668
		return oidcmp(&a->object->oid, &b->object->oid);
J
Junio C Hamano 已提交
2669 2670 2671 2672 2673 2674 2675 2676 2677 2678
}

static void add_objects_in_unpacked_packs(struct rev_info *revs)
{
	struct packed_git *p;
	struct in_pack in_pack;
	uint32_t i;

	memset(&in_pack, 0, sizeof(in_pack));

2679
	for (p = get_packed_git(the_repository); p; p = p->next) {
2680
		struct object_id oid;
J
Junio C Hamano 已提交
2681 2682
		struct object *o;

2683
		if (!p->pack_local || p->pack_keep || p->pack_keep_in_core)
J
Junio C Hamano 已提交
2684 2685 2686 2687 2688 2689 2690 2691 2692
			continue;
		if (open_pack_index(p))
			die("cannot open pack index");

		ALLOC_GROW(in_pack.array,
			   in_pack.nr + p->num_objects,
			   in_pack.alloc);

		for (i = 0; i < p->num_objects; i++) {
2693 2694
			nth_packed_object_oid(&oid, p, i);
			o = lookup_unknown_object(oid.hash);
J
Junio C Hamano 已提交
2695 2696 2697 2698 2699 2700 2701
			if (!(o->flags & OBJECT_ADDED))
				mark_in_pack_object(o, p, &in_pack);
			o->flags |= OBJECT_ADDED;
		}
	}

	if (in_pack.nr) {
R
René Scharfe 已提交
2702
		QSORT(in_pack.array, in_pack.nr, ofscmp);
J
Junio C Hamano 已提交
2703 2704
		for (i = 0; i < in_pack.nr; i++) {
			struct object *o = in_pack.array[i].object;
2705
			add_object_entry(&o->oid, o->type, "", 0);
J
Junio C Hamano 已提交
2706 2707 2708 2709 2710
		}
	}
	free(in_pack.array);
}

2711
static int add_loose_object(const struct object_id *oid, const char *path,
2712 2713
			    void *data)
{
2714
	enum object_type type = oid_object_info(oid, NULL);
2715 2716 2717 2718 2719 2720

	if (type < 0) {
		warning("loose object at %s could not be examined", path);
		return 0;
	}

2721
	add_object_entry(oid, type, "", 0);
2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736
	return 0;
}

/*
 * We actually don't even have to worry about reachability here.
 * add_object_entry will weed out duplicates, so we just add every
 * loose object we find.
 */
static void add_unreachable_loose_objects(void)
{
	for_each_loose_file_in_objdir(get_object_directory(),
				      add_loose_object,
				      NULL, NULL, NULL);
}

2737
static int has_sha1_pack_kept_or_nonlocal(const struct object_id *oid)
2738 2739 2740 2741
{
	static struct packed_git *last_found = (void *)1;
	struct packed_git *p;

2742 2743
	p = (last_found != (void *)1) ? last_found :
					get_packed_git(the_repository);
2744 2745

	while (p) {
2746 2747
		if ((!p->pack_local || p->pack_keep ||
				p->pack_keep_in_core) &&
2748
			find_pack_entry_one(oid->hash, p)) {
2749 2750 2751 2752
			last_found = p;
			return 1;
		}
		if (p == last_found)
2753
			p = get_packed_git(the_repository);
2754 2755 2756 2757 2758 2759 2760 2761
		else
			p = p->next;
		if (p == last_found)
			p = p->next;
	}
	return 0;
}

2762 2763 2764 2765 2766 2767 2768
/*
 * Store a list of sha1s that are should not be discarded
 * because they are either written too recently, or are
 * reachable from another object that was.
 *
 * This is filled by get_object_list.
 */
2769
static struct oid_array recent_objects;
2770

2771
static int loosened_object_can_be_discarded(const struct object_id *oid,
2772
					    timestamp_t mtime)
2773 2774 2775 2776 2777
{
	if (!unpack_unreachable_expiration)
		return 0;
	if (mtime > unpack_unreachable_expiration)
		return 0;
2778
	if (oid_array_lookup(&recent_objects, oid) >= 0)
2779
		return 0;
2780 2781 2782
	return 1;
}

2783 2784 2785 2786
static void loosen_unused_packed_objects(struct rev_info *revs)
{
	struct packed_git *p;
	uint32_t i;
2787
	struct object_id oid;
2788

2789
	for (p = get_packed_git(the_repository); p; p = p->next) {
2790
		if (!p->pack_local || p->pack_keep || p->pack_keep_in_core)
2791 2792 2793 2794 2795 2796
			continue;

		if (open_pack_index(p))
			die("cannot open pack index");

		for (i = 0; i < p->num_objects; i++) {
2797 2798
			nth_packed_object_oid(&oid, p, i);
			if (!packlist_find(&to_pack, oid.hash, NULL) &&
2799
			    !has_sha1_pack_kept_or_nonlocal(&oid) &&
2800
			    !loosened_object_can_be_discarded(&oid, p->mtime))
2801
				if (force_object_loose(&oid, p->mtime))
2802 2803 2804 2805 2806
					die("unable to force loose object");
		}
	}
}

2807
/*
2808 2809 2810
 * This tracks any options which pack-reuse code expects to be on, or which a
 * reader of the pack might not understand, and which would therefore prevent
 * blind reuse of what we have on disk.
2811 2812 2813
 */
static int pack_options_allow_reuse(void)
{
2814 2815
	return pack_to_stdout &&
	       allow_ofs_delta &&
2816 2817
	       !ignore_packed_keep_on_disk &&
	       !ignore_packed_keep_in_core &&
2818 2819
	       (!local || !have_non_local_packs) &&
	       !incremental;
2820 2821
}

2822 2823 2824 2825 2826
static int get_object_list_from_bitmap(struct rev_info *revs)
{
	if (prepare_bitmap_walk(revs) < 0)
		return -1;

2827 2828
	if (pack_options_allow_reuse() &&
	    !reuse_partial_packfile_from_bitmap(
2829 2830 2831 2832 2833
			&reuse_packfile,
			&reuse_packfile_objects,
			&reuse_packfile_offset)) {
		assert(reuse_packfile_objects);
		nr_result += reuse_packfile_objects;
2834
		display_progress(progress_state, nr_result);
2835 2836 2837 2838 2839 2840
	}

	traverse_bitmap_commit_list(&add_object_entry_from_bitmap);
	return 0;
}

2841
static void record_recent_object(struct object *obj,
2842
				 const char *name,
2843 2844
				 void *data)
{
2845
	oid_array_append(&recent_objects, &obj->oid);
2846 2847 2848 2849
}

static void record_recent_commit(struct commit *commit, void *data)
{
2850
	oid_array_append(&recent_objects, &commit->object.oid);
2851 2852
}

2853
static void get_object_list(int ac, const char **av)
2854 2855 2856 2857 2858 2859 2860 2861 2862
{
	struct rev_info revs;
	char line[1000];
	int flags = 0;

	init_revisions(&revs, NULL);
	save_commit_buffer = 0;
	setup_revisions(ac, av, &revs, NULL);

2863 2864 2865
	/* make sure shallows are read */
	is_repository_shallow();

2866 2867
	while (fgets(line, sizeof(line), stdin) != NULL) {
		int len = strlen(line);
2868
		if (len && line[len - 1] == '\n')
2869 2870 2871 2872 2873 2874
			line[--len] = 0;
		if (!len)
			break;
		if (*line == '-') {
			if (!strcmp(line, "--not")) {
				flags ^= UNINTERESTING;
2875
				write_bitmap_index = 0;
2876 2877
				continue;
			}
2878
			if (starts_with(line, "--shallow ")) {
2879 2880
				struct object_id oid;
				if (get_oid_hex(line + 10, &oid))
2881
					die("not an SHA-1 '%s'", line + 10);
2882
				register_shallow(&oid);
2883
				use_bitmap_index = 0;
2884 2885
				continue;
			}
2886 2887
			die("not a rev '%s'", line);
		}
2888
		if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME))
2889 2890 2891
			die("bad revision '%s'", line);
	}

2892 2893 2894
	if (use_bitmap_index && !get_object_list_from_bitmap(&revs))
		return;

2895 2896
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
2897
	mark_edges_uninteresting(&revs, show_edge);
2898 2899 2900 2901 2902 2903

	if (!fn_show_object)
		fn_show_object = show_object;
	traverse_commit_list_filtered(&filter_options, &revs,
				      show_commit, fn_show_object, NULL,
				      NULL);
J
Junio C Hamano 已提交
2904

2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915
	if (unpack_unreachable_expiration) {
		revs.ignore_missing_links = 1;
		if (add_unseen_recent_objects_to_traversal(&revs,
				unpack_unreachable_expiration))
			die("unable to add recent objects");
		if (prepare_revision_walk(&revs))
			die("revision walk setup failed");
		traverse_commit_list(&revs, record_recent_commit,
				     record_recent_object, NULL);
	}

J
Junio C Hamano 已提交
2916 2917
	if (keep_unreachable)
		add_objects_in_unpacked_packs(&revs);
2918 2919
	if (pack_loose_unreachable)
		add_unreachable_loose_objects();
2920 2921
	if (unpack_unreachable)
		loosen_unused_packed_objects(&revs);
2922

2923
	oid_array_clear(&recent_objects);
2924 2925
}

2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951
static void add_extra_kept_packs(const struct string_list *names)
{
	struct packed_git *p;

	if (!names->nr)
		return;

	for (p = get_packed_git(the_repository); p; p = p->next) {
		const char *name = basename(p->pack_name);
		int i;

		if (!p->pack_local)
			continue;

		for (i = 0; i < names->nr; i++)
			if (!fspathcmp(name, names->items[i].string))
				break;

		if (i < names->nr) {
			p->pack_keep_in_core = 1;
			ignore_packed_keep_in_core = 1;
			continue;
		}
	}
}

2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966
static int option_parse_index_version(const struct option *opt,
				      const char *arg, int unset)
{
	char *c;
	const char *val = arg;
	pack_idx_opts.version = strtoul(val, &c, 10);
	if (pack_idx_opts.version > 2)
		die(_("unsupported index version %s"), val);
	if (*c == ',' && c[1])
		pack_idx_opts.off32_limit = strtoul(c+1, &c, 0);
	if (*c || pack_idx_opts.off32_limit & 0x80000000)
		die(_("bad index version '%s'"), val);
	return 0;
}

2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981
static int option_parse_unpack_unreachable(const struct option *opt,
					   const char *arg, int unset)
{
	if (unset) {
		unpack_unreachable = 0;
		unpack_unreachable_expiration = 0;
	}
	else {
		unpack_unreachable = 1;
		if (arg)
			unpack_unreachable_expiration = approxidate(arg);
	}
	return 0;
}

2982 2983 2984
int cmd_pack_objects(int argc, const char **argv, const char *prefix)
{
	int use_internal_rev_list = 0;
2985
	int thin = 0;
2986
	int shallow = 0;
2987
	int all_progress_implied = 0;
J
Jeff King 已提交
2988
	struct argv_array rp = ARGV_ARRAY_INIT;
2989
	int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0;
2990
	int rev_list_index = 0;
2991
	struct string_list keep_pack_list = STRING_LIST_INIT_NODUP;
2992 2993
	struct option pack_objects_options[] = {
		OPT_SET_INT('q', "quiet", &progress,
2994
			    N_("do not show progress meter"), 0),
2995
		OPT_SET_INT(0, "progress", &progress,
2996
			    N_("show progress meter"), 1),
2997
		OPT_SET_INT(0, "all-progress", &progress,
2998
			    N_("show progress meter during object writing phase"), 2),
2999 3000
		OPT_BOOL(0, "all-progress-implied",
			 &all_progress_implied,
3001 3002 3003
			 N_("similar to --all-progress when progress meter is shown")),
		{ OPTION_CALLBACK, 0, "index-version", NULL, N_("version[,offset]"),
		  N_("write the pack index file in the specified idx format version"),
3004
		  0, option_parse_index_version },
3005 3006
		OPT_MAGNITUDE(0, "max-pack-size", &pack_size_limit,
			      N_("maximum size of each output pack file")),
3007
		OPT_BOOL(0, "local", &local,
3008
			 N_("ignore borrowed objects from alternate object store")),
3009
		OPT_BOOL(0, "incremental", &incremental,
3010
			 N_("ignore packed objects")),
3011
		OPT_INTEGER(0, "window", &window,
3012
			    N_("limit pack window by objects")),
3013 3014
		OPT_MAGNITUDE(0, "window-memory", &window_memory_limit,
			      N_("limit pack window by memory in addition to object limit")),
3015
		OPT_INTEGER(0, "depth", &depth,
3016
			    N_("maximum length of delta chain allowed in the resulting pack")),
3017
		OPT_BOOL(0, "reuse-delta", &reuse_delta,
3018
			 N_("reuse existing deltas")),
3019
		OPT_BOOL(0, "reuse-object", &reuse_object,
3020
			 N_("reuse existing objects")),
3021
		OPT_BOOL(0, "delta-base-offset", &allow_ofs_delta,
3022
			 N_("use OFS_DELTA objects")),
3023
		OPT_INTEGER(0, "threads", &delta_search_threads,
3024
			    N_("use threads when searching for best delta matches")),
3025
		OPT_BOOL(0, "non-empty", &non_empty,
3026
			 N_("do not create an empty pack output")),
3027
		OPT_BOOL(0, "revs", &use_internal_rev_list,
3028
			 N_("read revision arguments from standard input")),
3029
		{ OPTION_SET_INT, 0, "unpacked", &rev_list_unpacked, NULL,
3030
		  N_("limit the objects to those that are not yet packed"),
3031 3032
		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
		{ OPTION_SET_INT, 0, "all", &rev_list_all, NULL,
3033
		  N_("include objects reachable from any reference"),
3034 3035
		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
		{ OPTION_SET_INT, 0, "reflog", &rev_list_reflog, NULL,
3036
		  N_("include objects referred by reflog entries"),
3037
		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
3038 3039 3040
		{ OPTION_SET_INT, 0, "indexed-objects", &rev_list_index, NULL,
		  N_("include objects referred to by the index"),
		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
3041
		OPT_BOOL(0, "stdout", &pack_to_stdout,
3042
			 N_("output pack to stdout")),
3043
		OPT_BOOL(0, "include-tag", &include_tag,
3044
			 N_("include tag objects that refer to objects to be packed")),
3045
		OPT_BOOL(0, "keep-unreachable", &keep_unreachable,
3046
			 N_("keep unreachable objects")),
3047 3048
		OPT_BOOL(0, "pack-loose-unreachable", &pack_loose_unreachable,
			 N_("pack loose unreachable objects")),
3049 3050
		{ OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"),
		  N_("unpack unreachable objects newer than <time>"),
3051
		  PARSE_OPT_OPTARG, option_parse_unpack_unreachable },
3052
		OPT_BOOL(0, "thin", &thin,
3053
			 N_("create thin packs")),
3054 3055
		OPT_BOOL(0, "shallow", &shallow,
			 N_("create packs suitable for shallow fetches")),
3056
		OPT_BOOL(0, "honor-pack-keep", &ignore_packed_keep_on_disk,
3057
			 N_("ignore packs that have companion .keep file")),
3058 3059
		OPT_STRING_LIST(0, "keep-pack", &keep_pack_list, N_("name"),
				N_("ignore this pack")),
3060
		OPT_INTEGER(0, "compression", &pack_compression_level,
3061
			    N_("pack compression level")),
3062
		OPT_SET_INT(0, "keep-true-parents", &grafts_replace_parents,
3063
			    N_("do not hide commits by grafts"), 0),
3064 3065
		OPT_BOOL(0, "use-bitmap-index", &use_bitmap_index,
			 N_("use a bitmap index if available to speed up counting objects")),
3066 3067
		OPT_BOOL(0, "write-bitmap-index", &write_bitmap_index,
			 N_("write a bitmap index together with the pack index")),
3068 3069 3070 3071
		OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
		{ OPTION_CALLBACK, 0, "missing", NULL, N_("action"),
		  N_("handling for missing objects"), PARSE_OPT_NONEG,
		  option_parse_missing_action },
3072 3073
		OPT_BOOL(0, "exclude-promisor-objects", &exclude_promisor_objects,
			 N_("do not pack objects in promisor packfiles")),
3074 3075
		OPT_END(),
	};
3076

3077
	check_replace_refs = 0;
3078

3079
	reset_pack_idx_option(&pack_idx_opts);
3080
	git_config(git_pack_config, NULL);
3081 3082

	progress = isatty(2);
3083 3084
	argc = parse_options(argc, argv, prefix, pack_objects_options,
			     pack_usage, 0);
3085

3086 3087 3088
	if (argc) {
		base_name = argv[0];
		argc--;
3089
	}
3090 3091
	if (pack_to_stdout != !base_name || argc)
		usage_with_options(pack_usage, pack_objects_options);
3092

J
Jeff King 已提交
3093
	argv_array_push(&rp, "pack-objects");
3094 3095
	if (thin) {
		use_internal_rev_list = 1;
3096 3097 3098
		argv_array_push(&rp, shallow
				? "--objects-edge-aggressive"
				: "--objects-edge");
3099
	} else
J
Jeff King 已提交
3100
		argv_array_push(&rp, "--objects");
3101

3102 3103
	if (rev_list_all) {
		use_internal_rev_list = 1;
J
Jeff King 已提交
3104
		argv_array_push(&rp, "--all");
3105 3106 3107
	}
	if (rev_list_reflog) {
		use_internal_rev_list = 1;
J
Jeff King 已提交
3108
		argv_array_push(&rp, "--reflog");
3109
	}
3110 3111 3112
	if (rev_list_index) {
		use_internal_rev_list = 1;
		argv_array_push(&rp, "--indexed-objects");
3113 3114 3115
	}
	if (rev_list_unpacked) {
		use_internal_rev_list = 1;
J
Jeff King 已提交
3116
		argv_array_push(&rp, "--unpacked");
3117
	}
3118

3119 3120 3121 3122 3123 3124
	if (exclude_promisor_objects) {
		use_internal_rev_list = 1;
		fetch_if_missing = 0;
		argv_array_push(&rp, "--exclude-promisor-objects");
	}

3125 3126 3127 3128 3129 3130
	if (!reuse_object)
		reuse_delta = 0;
	if (pack_compression_level == -1)
		pack_compression_level = Z_DEFAULT_COMPRESSION;
	else if (pack_compression_level < 0 || pack_compression_level > Z_BEST_COMPRESSION)
		die("bad pack compression level %d", pack_compression_level);
3131 3132 3133 3134

	if (!delta_search_threads)	/* --threads=0 means autodetect */
		delta_search_threads = online_cpus();

3135 3136
#ifdef NO_PTHREADS
	if (delta_search_threads != 1)
3137
		warning("no threads support, ignoring --threads");
3138
#endif
3139 3140
	if (!pack_to_stdout && !pack_size_limit)
		pack_size_limit = pack_size_limit_cfg;
3141 3142
	if (pack_to_stdout && pack_size_limit)
		die("--max-pack-size cannot be used to build a pack for transfer.");
3143 3144 3145 3146
	if (pack_size_limit && pack_size_limit < 1024*1024) {
		warning("minimum pack size limit is 1 MiB");
		pack_size_limit = 1024*1024;
	}
3147

3148 3149
	if (!pack_to_stdout && thin)
		die("--thin cannot be used to build an indexable pack.");
3150

3151 3152
	if (keep_unreachable && unpack_unreachable)
		die("--keep-unreachable and --unpack-unreachable are incompatible.");
3153 3154
	if (!rev_list_all || !rev_list_reflog || !rev_list_index)
		unpack_unreachable_expiration = 0;
3155

3156 3157 3158 3159 3160 3161
	if (filter_options.choice) {
		if (!pack_to_stdout)
			die("cannot use --filter without --stdout.");
		use_bitmap_index = 0;
	}

3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178
	/*
	 * "soft" reasons not to use bitmaps - for on-disk repack by default we want
	 *
	 * - to produce good pack (with bitmap index not-yet-packed objects are
	 *   packed in suboptimal order).
	 *
	 * - to use more robust pack-generation codepath (avoiding possible
	 *   bugs in bitmap code and possible bitmap index corruption).
	 */
	if (!pack_to_stdout)
		use_bitmap_index_default = 0;

	if (use_bitmap_index < 0)
		use_bitmap_index = use_bitmap_index_default;

	/* "hard" reasons not to use bitmaps; these just won't work at all */
	if (!use_internal_rev_list || (!pack_to_stdout && write_bitmap_index) || is_repository_shallow())
3179 3180
		use_bitmap_index = 0;

3181 3182 3183
	if (pack_to_stdout || !rev_list_all)
		write_bitmap_index = 0;

3184 3185 3186
	if (progress && all_progress_implied)
		progress = 2;

3187 3188
	add_extra_kept_packs(&keep_pack_list);
	if (ignore_packed_keep_on_disk) {
3189
		struct packed_git *p;
3190
		for (p = get_packed_git(the_repository); p; p = p->next)
3191 3192 3193
			if (p->pack_local && p->pack_keep)
				break;
		if (!p) /* no keep-able packs found */
3194
			ignore_packed_keep_on_disk = 0;
3195 3196 3197
	}
	if (local) {
		/*
3198 3199 3200
		 * unlike ignore_packed_keep_on_disk above, we do not
		 * want to unset "local" based on looking at packs, as
		 * it also covers non-local objects
3201 3202
		 */
		struct packed_git *p;
3203
		for (p = get_packed_git(the_repository); p; p = p->next) {
3204 3205 3206 3207 3208 3209
			if (!p->pack_local) {
				have_non_local_packs = 1;
				break;
			}
		}
	}
3210

3211
	if (progress)
3212
		progress_state = start_progress(_("Counting objects"), 0);
3213 3214
	if (!use_internal_rev_list)
		read_object_list_from_stdin();
3215
	else {
J
Jeff King 已提交
3216 3217
		get_object_list(rp.argc, rp.argv);
		argv_array_clear(&rp);
3218
	}
3219
	cleanup_preferred_base();
3220 3221
	if (include_tag && nr_result)
		for_each_ref(add_ref_tag, NULL);
N
Nicolas Pitre 已提交
3222
	stop_progress(&progress_state);
N
Nicolas Pitre 已提交
3223

3224
	if (non_empty && !nr_result)
3225
		return 0;
3226 3227
	if (nr_result)
		prepare_pack(window, depth);
3228
	write_pack_file();
3229
	if (progress)
3230 3231
		fprintf(stderr, "Total %"PRIu32" (delta %"PRIu32"),"
			" reused %"PRIu32" (delta %"PRIu32")\n",
3232
			written, written_delta, reused, reused_delta);
3233 3234
	return 0;
}