pack-objects.c 84.9 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"
N
Nicolas Pitre 已提交
33

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

40
/*
41 42 43
 * 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.
44
 */
45 46
static struct packing_data to_pack;

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

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

71 72 73 74
static struct packed_git *reuse_packfile;
static uint32_t reuse_packfile_objects;
static off_t reuse_packfile_offset;

75 76
static int use_bitmap_index_default = 1;
static int use_bitmap_index = -1;
77
static int write_bitmap_index;
78
static uint16_t write_bitmap_options;
79

80 81
static int exclude_promisor_objects;

82
static unsigned long delta_cache_size = 0;
83
static unsigned long max_delta_cache_size = 256 * 1024 * 1024;
84
static unsigned long cache_max_small_delta_size = 1000;
85

86 87
static unsigned long window_memory_limit = 0;

88 89 90
static struct list_objects_filter_options filter_options;

enum missing_action {
91 92 93
	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 */
94 95 96 97
};
static enum missing_action arg_missing_action;
static show_object_fn fn_show_object;

98 99 100
/*
 * stats
 */
101 102
static uint32_t written, written_delta;
static uint32_t reused, reused_delta;
103

104 105 106 107 108 109 110 111 112 113 114
/*
 * 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;
115
		REALLOC_ARRAY(indexed_commits, indexed_commits_alloc);
116 117 118 119
	}

	indexed_commits[indexed_commits_nr++] = commit;
}
120

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

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

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

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

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

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

	free(in);
	return stream.total_out;
}

168
static unsigned long write_large_blob_data(struct git_istream *st, struct hashfile *f,
169
					   const struct object_id *oid)
170 171 172 173 174 175 176 177 178 179 180 181 182
{
	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)
183
			die(_("unable to read %s"), oid_to_hex(oid));
184 185 186 187 188 189 190 191

		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);
192
			hashwrite(f, obuf, stream.next_out - obuf);
193 194 195 196 197 198 199 200 201 202 203 204 205 206
			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;
}

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

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

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

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

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

	if (!usable_delta) {
269
		if (oe_type(entry) == OBJ_BLOB &&
270
		    entry->size > big_file_threshold &&
271
		    (st = open_istream(&entry->idx.oid, &type, &size, NULL)) != NULL)
272 273
			buf = NULL;
		else {
274
			buf = read_object_file(&entry->idx.oid, &type, &size);
275
			if (!buf)
276 277
				die(_("unable to read %s"),
				    oid_to_hex(&entry->idx.oid));
278
		}
279 280 281 282
		/*
		 * make sure no cached delta data remains from a
		 * previous attempt before a pack split occurred.
		 */
283
		FREE_AND_NULL(entry->delta_data);
284 285 286 287 288 289 290 291 292 293 294 295 296 297
		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;
	}

298 299 300
	if (st)	/* large blob case, just assume we don't compress well */
		datalen = size;
	else if (entry->z_delta_size)
301 302 303 304 305 306 307 308
		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.
	 */
309 310
	hdrlen = encode_in_pack_object_header(header, sizeof(header),
					      type, size);
311 312 313 314 315 316 317 318 319 320 321 322 323

	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) {
324 325
			if (st)
				close_istream(st);
326 327 328
			free(buf);
			return 0;
		}
329 330
		hashwrite(f, header, hdrlen);
		hashwrite(f, dheader + pos, sizeof(dheader) - pos);
331 332 333 334 335 336 337
		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) {
338 339
			if (st)
				close_istream(st);
340 341 342
			free(buf);
			return 0;
		}
343 344
		hashwrite(f, header, hdrlen);
		hashwrite(f, entry->delta->idx.oid.hash, 20);
345 346 347
		hdrlen += 20;
	} else {
		if (limit && hdrlen + datalen + 20 >= limit) {
348 349
			if (st)
				close_istream(st);
350 351 352
			free(buf);
			return 0;
		}
353
		hashwrite(f, header, hdrlen);
354
	}
355
	if (st) {
356
		datalen = write_large_blob_data(st, f, &entry->idx.oid);
357 358
		close_istream(st);
	} else {
359
		hashwrite(f, buf, datalen);
360 361
		free(buf);
	}
362 363 364 365 366

	return hdrlen + datalen;
}

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

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

	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)) {
391 392
		error("bad packed object CRC for %s",
		      oid_to_hex(&entry->idx.oid));
393 394 395 396 397 398 399 400 401
		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)) {
402 403
		error("corrupt packed object for %s",
		      oid_to_hex(&entry->idx.oid));
404 405 406 407 408 409 410 411 412 413 414 415 416 417
		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;
		}
418 419
		hashwrite(f, header, hdrlen);
		hashwrite(f, dheader + pos, sizeof(dheader) - pos);
420 421 422 423 424 425 426
		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;
		}
427 428
		hashwrite(f, header, hdrlen);
		hashwrite(f, entry->delta->idx.oid.hash, 20);
429 430 431 432 433 434 435
		hdrlen += 20;
		reused_delta++;
	} else {
		if (limit && hdrlen + datalen + 20 >= limit) {
			unuse_pack(&w_curs);
			return 0;
		}
436
		hashwrite(f, header, hdrlen);
437 438 439 440 441 442 443 444
	}
	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 */
445
static off_t write_object(struct hashfile *f,
446 447
			  struct object_entry *entry,
			  off_t write_offset)
448
{
449 450
	unsigned long limit;
	off_t len;
451
	int usable_delta, to_reuse;
452

453 454 455
	if (!pack_to_stdout)
		crc32_begin(f);

456
	/* apply size limit if limited packsize and not first object */
457 458 459 460 461 462 463 464 465 466
	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;
467 468 469 470 471 472 473 474 475 476 477 478

	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 */

479
	if (!reuse_object)
480 481
		to_reuse = 0;	/* explicit */
	else if (!entry->in_pack)
482
		to_reuse = 0;	/* can't reuse what we don't have */
483 484
	else if (oe_type(entry) == OBJ_REF_DELTA ||
		 oe_type(entry) == OBJ_OFS_DELTA)
485 486 487
				/* check_object() decided it for us ... */
		to_reuse = usable_delta;
				/* ... but pack split may override that */
488
	else if (oe_type(entry) != entry->in_pack_type)
489 490 491 492 493 494 495 496
		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.
				 */

497 498 499 500 501 502
	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;
503

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

512 513 514 515 516 517 518
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 */
};

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

526 527 528 529 530 531 532 533
	/*
	 * 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",
534
			oid_to_hex(&e->idx.oid));
535 536 537 538 539
		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;
	}
540

541
	/* if we are deltified, write out base object first. */
542 543 544 545 546 547 548 549 550 551 552 553 554 555
	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;
		}
	}
556

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

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

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

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

588
static inline void add_to_write_order(struct object_entry **wo,
589
			       unsigned int *endp,
590 591 592 593 594 595 596 597 598
			       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,
599
					   unsigned int *endp,
600 601
					   struct object_entry *e)
{
602 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
	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;
		}
	};
639 640 641
}

static void add_family_to_write_order(struct object_entry **wo,
642
				      unsigned int *endp,
643 644 645 646 647 648 649 650 651 652 653
				      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)
{
654
	unsigned int i, wo_end, last_untagged;
655

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

659
	for (i = 0; i < to_pack.nr_objects; i++) {
660 661 662 663 664 665 666 667 668 669 670
		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.
	 */
671
	for (i = to_pack.nr_objects; i > 0;) {
672
		struct object_entry *e = &objects[--i];
673 674 675 676 677 678 679 680 681 682
		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.
	 */
683
	for_each_tag_ref(mark_tagged, NULL);
684 685

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

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

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

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

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

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

	return wo;
}

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

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

747
	fd = git_open(reuse_packfile->pack_name);
748 749 750 751 752 753 754 755 756 757
	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;

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

	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;

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

		/*
		 * 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);
783 784 785
	}

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

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

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

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

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

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

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

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

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

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

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

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

859 860 861 862 863 864 865
			/*
			 * 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.
			 */
866
			if (stat(pack_tmp_name, &st) < 0) {
867
				warning_errno("failed to stat %s", pack_tmp_name);
868 869 870 871 872 873
			} else if (!last_mtime) {
				last_mtime = st.st_mtime;
			} else {
				struct utimbuf utb;
				utb.actime = st.st_atime;
				utb.modtime = --last_mtime;
874
				if (utime(pack_tmp_name, &utb) < 0)
875
					warning_errno("failed utime() on %s", pack_tmp_name);
876 877
			}

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

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

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 987 988 989 990 991 992 993 994 995 996 997 998 999
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.
	 */
	if (!ignore_packed_keep &&
	    (!local || !have_non_local_packs))
		return 1;

	if (local && !p->pack_local)
		return 0;
	if (ignore_packed_keep && p->pack_local && p->pack_keep)
		return 0;

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

J
Jeff King 已提交
1000 1001 1002 1003
/*
 * 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).
 *
1004 1005 1006 1007
 * 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 已提交
1008
 */
1009
static int want_object_in_pack(const struct object_id *oid,
J
Jeff King 已提交
1010 1011 1012 1013
			       int exclude,
			       struct packed_git **found_pack,
			       off_t *found_offset)
{
1014
	int want;
1015
	struct list_head *pos;
J
Jeff King 已提交
1016

1017
	if (!exclude && local && has_loose_object_nonlocal(oid->hash))
1018 1019
		return 0;

1020 1021 1022 1023 1024 1025 1026 1027 1028 1029
	/*
	 * 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;
	}
1030
	list_for_each(pos, get_packed_git_mru(the_repository)) {
1031
		struct packed_git *p = list_entry(pos, struct packed_git, mru);
1032 1033 1034 1035 1036
		off_t offset;

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

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

J
Jeff King 已提交
1055 1056 1057
	return 1;
}

1058
static void create_object_entry(const struct object_id *oid,
J
Jeff King 已提交
1059 1060 1061 1062 1063 1064 1065 1066 1067
				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 已提交
1068

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

J
Jeff King 已提交
1081 1082
	entry->no_try_delta = no_try_delta;
}
N
Nicolas Pitre 已提交
1083

1084 1085 1086 1087
static const char no_closure_warning[] = N_(
"disabling bitmap writing, as some objects are not being packed"
);

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

1095
	if (have_duplicate_entry(oid, exclude, &index_pos))
J
Jeff King 已提交
1096
		return 0;
1097

1098
	if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset)) {
1099 1100 1101 1102 1103
		/* 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 已提交
1104
		return 0;
1105
	}
N
Nicolas Pitre 已提交
1106

1107
	create_object_entry(oid, type, pack_name_hash(name),
J
Jeff King 已提交
1108 1109
			    exclude, name && no_try_delta(name),
			    index_pos, found_pack, found_offset);
1110

1111
	display_progress(progress_state, nr_result);
N
Nicolas Pitre 已提交
1112
	return 1;
1113 1114
}

1115
static int add_object_entry_from_bitmap(const struct object_id *oid,
1116 1117 1118 1119 1120 1121
					enum object_type type,
					int flags, uint32_t name_hash,
					struct packed_git *pack, off_t offset)
{
	uint32_t index_pos;

1122
	if (have_duplicate_entry(oid, 0, &index_pos))
1123 1124
		return 0;

1125
	if (!want_object_in_pack(oid, 0, &pack, &offset))
1126 1127
		return 0;

1128
	create_object_entry(oid, type, name_hash, 0, 0, index_pos, pack, offset);
1129

1130
	display_progress(progress_state, nr_result);
N
Nicolas Pitre 已提交
1131
	return 1;
1132 1133
}

1134
struct pbase_tree_cache {
1135
	struct object_id oid;
1136 1137 1138 1139 1140 1141 1142
	int ref;
	int temporary;
	void *tree_data;
	unsigned long tree_size;
};

static struct pbase_tree_cache *(pbase_tree_cache[256]);
1143
static int pbase_tree_cache_ix(const struct object_id *oid)
1144
{
1145
	return oid->hash[0] % ARRAY_SIZE(pbase_tree_cache);
1146 1147 1148 1149 1150 1151 1152 1153 1154
}
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 已提交
1155
	 * going to evict it or find it through _get()
1156 1157 1158 1159 1160 1161
	 * mechanism -- this is for the toplevel node that
	 * would almost always change with any commit.
	 */
	struct pbase_tree_cache pcache;
} *pbase_tree;

1162
static struct pbase_tree_cache *pbase_tree_get(const struct object_id *oid)
1163 1164 1165 1166
{
	struct pbase_tree_cache *ent, *nent;
	void *data;
	unsigned long size;
1167
	enum object_type type;
1168
	int neigh;
1169
	int my_ix = pbase_tree_cache_ix(oid);
1170 1171 1172 1173 1174 1175 1176 1177
	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];
1178
		if (ent && !oidcmp(&ent->oid, oid)) {
1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193
			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.
	 */
1194
	data = read_object_file(oid, &type, &size);
1195 1196
	if (!data)
		return NULL;
1197
	if (type != OBJ_TREE) {
1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219
		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;
	}
1220
	oidcpy(&nent->oid, oid);
1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248
	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,
1249 1250
			     int cmplen,
			     const char *fullname)
1251
{
1252
	struct name_entry entry;
1253
	int cmp;
1254 1255

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

1276
			tree = pbase_tree_get(entry.oid);
1277 1278
			if (!tree)
				return;
1279
			init_tree_desc(&sub, tree->tree_data, tree->tree_size);
1280

1281
			add_pbase_object(&sub, down, downlen, fullname);
1282 1283 1284 1285
			pbase_tree_put(tree);
		}
	}
}
1286

1287 1288 1289 1290 1291 1292 1293 1294
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) {
1295
		int mi = lo + (hi - lo) / 2;
1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307
		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)
{
1308
	int pos = done_pbase_path_pos(hash);
1309 1310 1311
	if (0 <= pos)
		return 1;
	pos = -pos - 1;
1312 1313 1314
	ALLOC_GROW(done_pbase_paths,
		   done_pbase_paths_num + 1,
		   done_pbase_paths_alloc);
1315 1316
	done_pbase_paths_num++;
	if (pos < done_pbase_paths_num)
R
René Scharfe 已提交
1317 1318
		MOVE_ARRAY(done_pbase_paths + pos + 1, done_pbase_paths + pos,
			   done_pbase_paths_num - pos - 1);
1319 1320 1321 1322
	done_pbase_paths[pos] = hash;
	return 0;
}

1323
static void add_preferred_base_object(const char *name)
1324 1325
{
	struct pbase_tree *it;
1326
	int cmplen;
V
Vicent Marti 已提交
1327
	unsigned hash = pack_name_hash(name);
1328

1329
	if (!num_preferred_base || check_pbase_path(hash))
1330 1331
		return;

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

1345
static void add_preferred_base(struct object_id *oid)
1346
{
1347 1348 1349
	struct pbase_tree *it;
	void *data;
	unsigned long size;
1350
	struct object_id tree_oid;
1351

1352 1353 1354
	if (window <= num_preferred_base++)
		return;

1355
	data = read_object_with_reference(oid, tree_type, &size, &tree_oid);
1356
	if (!data)
1357
		return;
1358 1359

	for (it = pbase_tree; it; it = it->next) {
1360
		if (!oidcmp(&it->pcache.oid, &tree_oid)) {
1361 1362 1363 1364 1365 1366 1367 1368 1369
			free(data);
			return;
		}
	}

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

1370
	oidcpy(&it->pcache.oid, &tree_oid);
1371 1372
	it->pcache.tree_data = data;
	it->pcache.tree_size = size;
1373 1374
}

1375 1376 1377 1378 1379 1380 1381 1382
static void cleanup_preferred_base(void)
{
	struct pbase_tree *it;
	unsigned i;

	it = pbase_tree;
	pbase_tree = NULL;
	while (it) {
1383 1384 1385 1386
		struct pbase_tree *tmp = it;
		it = tmp->next;
		free(tmp->pcache.tree_data);
		free(tmp);
1387 1388 1389 1390 1391 1392
	}

	for (i = 0; i < ARRAY_SIZE(pbase_tree_cache); i++) {
		if (!pbase_tree_cache[i])
			continue;
		free(pbase_tree_cache[i]->tree_data);
1393
		FREE_AND_NULL(pbase_tree_cache[i]);
1394 1395
	}

1396
	FREE_AND_NULL(done_pbase_paths);
1397 1398 1399
	done_pbase_paths_num = done_pbase_paths_alloc = 0;
}

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

1413
		buf = use_pack(p, &w_curs, entry->in_pack_offset, &avail);
1414

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

1425 1426 1427 1428
		if (type < 0)
			BUG("invalid type %d", type);
		entry->in_pack_type = type;

1429 1430 1431 1432
		/*
		 * 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.
1433
		 */
1434 1435 1436
		switch (entry->in_pack_type) {
		default:
			/* Not a delta hence we've already got all we need. */
1437
			oe_set_type(entry, entry->in_pack_type);
1438
			entry->in_pack_header_size = used;
1439
			if (oe_type(entry) < OBJ_COMMIT || oe_type(entry) > OBJ_BLOB)
1440
				goto give_up;
1441 1442 1443
			unuse_pack(&w_curs);
			return;
		case OBJ_REF_DELTA:
1444
			if (reuse_delta && !entry->preferred_base)
1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456
				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;
1457 1458
				if (!ofs || MSB(ofs, 7)) {
					error("delta base offset overflow in pack for %s",
1459
					      oid_to_hex(&entry->idx.oid));
1460 1461
					goto give_up;
				}
1462 1463
				c = buf[used_0++];
				ofs = (ofs << 7) + (c & 127);
1464
			}
1465
			ofs = entry->in_pack_offset - ofs;
1466 1467
			if (ofs <= 0 || ofs >= entry->in_pack_offset) {
				error("delta base offset out of bound for %s",
1468
				      oid_to_hex(&entry->idx.oid));
1469 1470
				goto give_up;
			}
1471
			if (reuse_delta && !entry->preferred_base) {
1472 1473
				struct revindex_entry *revidx;
				revidx = find_pack_revindex(p, ofs);
1474 1475
				if (!revidx)
					goto give_up;
1476 1477
				base_ref = nth_packed_object_sha1(p, revidx->nr);
			}
1478 1479
			entry->in_pack_header_size = used + used_0;
			break;
1480 1481
		}

1482
		if (base_ref && (base_entry = packlist_find(&to_pack, base_ref, NULL))) {
1483 1484 1485 1486 1487 1488 1489 1490 1491
			/*
			 * 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.
1492
			 */
1493
			oe_set_type(entry, entry->in_pack_type);
1494
			entry->delta = base_entry;
1495
			entry->delta_size = entry->size;
1496 1497
			entry->delta_sibling = base_entry->delta_child;
			base_entry->delta_child = entry;
1498 1499 1500
			unuse_pack(&w_curs);
			return;
		}
1501

1502
		if (oe_type(entry)) {
1503 1504 1505 1506 1507 1508 1509
			/*
			 * 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);
1510 1511
			if (entry->size == 0)
				goto give_up;
1512
			unuse_pack(&w_curs);
1513 1514
			return;
		}
1515 1516 1517 1518 1519 1520

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

1525
	oe_set_type(entry, oid_object_info(&entry->idx.oid, &entry->size));
1526 1527 1528 1529 1530 1531
	/*
	 * 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.
	 */
1532 1533
}

1534 1535 1536 1537 1538 1539 1540
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)
1541
		return oidcmp(&a->idx.oid, &b->idx.oid);
1542 1543 1544 1545 1546 1547 1548 1549 1550

	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);
}

1551 1552 1553 1554 1555 1556 1557 1558 1559 1560
/*
 * 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.
1561 1562
 *
 *   3. Resetting our delta depth, as we are now a base object.
1563 1564 1565 1566 1567
 */
static void drop_reused_delta(struct object_entry *entry)
{
	struct object_entry **p = &entry->delta->delta_child;
	struct object_info oi = OBJECT_INFO_INIT;
1568
	enum object_type type;
1569 1570 1571 1572 1573 1574 1575 1576

	while (*p) {
		if (*p == entry)
			*p = (*p)->delta_sibling;
		else
			p = &(*p)->delta_sibling;
	}
	entry->delta = NULL;
1577
	entry->depth = 0;
1578 1579

	oi.sizep = &entry->size;
1580
	oi.typep = &type;
1581 1582 1583 1584
	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.
1585
		 * And if that fails, the error will be recorded in oe_type(entry)
1586 1587
		 * and dealt with in prepare_pack().
		 */
1588 1589 1590 1591
		oe_set_type(entry, oid_object_info(&entry->idx.oid,
						   &entry->size));
	} else {
		oe_set_type(entry, type);
1592 1593 1594 1595 1596 1597 1598
	}
}

/*
 * 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).
1599 1600 1601
 *
 * We also detect too-long reused chains that would violate our --depth
 * limit.
1602 1603 1604
 */
static void break_delta_chains(struct object_entry *entry)
{
1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625
	/*
	 * 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;
		}
1626 1627

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

		/*
1637 1638 1639
		 * 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.
1640
		 */
1641 1642 1643 1644
		if (!cur->delta) {
			cur->dfs_state = DFS_DONE;
			break;
		}
1645 1646

		/*
1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661
		 * 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.
1662
		 */
1663 1664 1665 1666 1667
		cur->dfs_state = DFS_ACTIVE;
		if (cur->delta->dfs_state == DFS_ACTIVE) {
			drop_reused_delta(cur);
			cur->dfs_state = DFS_DONE;
			break;
1668
		}
1669
	}
1670

1671 1672 1673 1674 1675 1676 1677 1678 1679
	/*
	 * 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;
1680

1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691
		/*
		 * 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);
1692 1693

		/*
1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709
		 * 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.
1710
		 */
1711 1712 1713 1714 1715
		cur->depth = (total_depth--) % (depth + 1);
		if (!cur->depth)
			drop_reused_delta(cur);

		cur->dfs_state = DFS_DONE;
1716 1717 1718
	}
}

1719 1720
static void get_object_details(void)
{
1721
	uint32_t i;
1722 1723
	struct object_entry **sorted_by_offset;

1724 1725 1726
	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 已提交
1727
	QSORT(sorted_by_offset, to_pack.nr_objects, pack_offset_sort);
1728

1729
	for (i = 0; i < to_pack.nr_objects; i++) {
1730 1731
		struct object_entry *entry = sorted_by_offset[i];
		check_object(entry);
1732
		if (big_file_threshold < entry->size)
1733 1734
			entry->no_try_delta = 1;
	}
1735

1736 1737 1738 1739 1740 1741 1742
	/*
	 * 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]);

1743
	free(sorted_by_offset);
1744 1745
}

1746 1747 1748 1749 1750 1751 1752 1753 1754
/*
 * 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.
 */
1755
static int type_size_sort(const void *_a, const void *_b)
1756
{
1757 1758
	const struct object_entry *a = *(struct object_entry **)_a;
	const struct object_entry *b = *(struct object_entry **)_b;
1759 1760
	enum object_type a_type = oe_type(a);
	enum object_type b_type = oe_type(b);
1761

1762
	if (a_type > b_type)
1763
		return -1;
1764
	if (a_type < b_type)
1765
		return 1;
1766
	if (a->hash > b->hash)
1767
		return -1;
1768
	if (a->hash < b->hash)
1769
		return 1;
1770
	if (a->preferred_base > b->preferred_base)
1771
		return -1;
1772 1773
	if (a->preferred_base < b->preferred_base)
		return 1;
1774
	if (a->size > b->size)
1775 1776
		return -1;
	if (a->size < b->size)
1777
		return 1;
1778
	return a < b ? -1 : (a > b);  /* newest first */
1779 1780 1781 1782 1783
}

struct unpacked {
	struct object_entry *entry;
	void *data;
1784
	struct delta_index *index;
1785
	unsigned depth;
1786 1787
};

1788 1789
static int delta_cacheable(unsigned long src_size, unsigned long trg_size,
			   unsigned long delta_size)
1790 1791 1792 1793
{
	if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size)
		return 0;

1794 1795 1796
	if (delta_size < cache_max_small_delta_size)
		return 1;

1797 1798 1799 1800 1801 1802 1803
	/* 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;
}

1804
#ifndef NO_PTHREADS
N
Nicolas Pitre 已提交
1805

1806
static pthread_mutex_t read_mutex;
N
Nicolas Pitre 已提交
1807 1808 1809
#define read_lock()		pthread_mutex_lock(&read_mutex)
#define read_unlock()		pthread_mutex_unlock(&read_mutex)

1810
static pthread_mutex_t cache_mutex;
1811 1812 1813
#define cache_lock()		pthread_mutex_lock(&cache_mutex)
#define cache_unlock()		pthread_mutex_unlock(&cache_mutex)

1814
static pthread_mutex_t progress_mutex;
N
Nicolas Pitre 已提交
1815 1816 1817 1818 1819
#define progress_lock()		pthread_mutex_lock(&progress_mutex)
#define progress_unlock()	pthread_mutex_unlock(&progress_mutex)

#else

1820 1821 1822 1823 1824 1825
#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 已提交
1826 1827 1828

#endif

1829
static int try_delta(struct unpacked *trg, struct unpacked *src,
1830
		     unsigned max_depth, unsigned long *mem_usage)
1831
{
1832 1833
	struct object_entry *trg_entry = trg->entry;
	struct object_entry *src_entry = src->entry;
1834
	unsigned long trg_size, src_size, delta_size, sizediff, max_size, sz;
1835
	unsigned ref_depth;
1836
	enum object_type type;
1837 1838 1839
	void *delta_buf;

	/* Don't bother doing diffs between different types */
1840
	if (oe_type(trg_entry) != oe_type(src_entry))
1841 1842
		return -1;

1843
	/*
1844 1845 1846 1847 1848 1849
	 * 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.
1850
	 */
1851
	if (reuse_delta && trg_entry->in_pack &&
1852
	    trg_entry->in_pack == src_entry->in_pack &&
1853
	    !src_entry->preferred_base &&
1854 1855
	    trg_entry->in_pack_type != OBJ_REF_DELTA &&
	    trg_entry->in_pack_type != OBJ_OFS_DELTA)
1856 1857
		return 0;

1858
	/* Let's not bust the allowed depth. */
1859
	if (src->depth >= max_depth)
1860
		return 0;
1861

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

1882 1883
	/* Load data if not already done */
	if (!trg->data) {
N
Nicolas Pitre 已提交
1884
		read_lock();
1885
		trg->data = read_object_file(&trg_entry->idx.oid, &type, &sz);
N
Nicolas Pitre 已提交
1886
		read_unlock();
1887 1888
		if (!trg->data)
			die("object %s cannot be read",
1889
			    oid_to_hex(&trg_entry->idx.oid));
1890 1891
		if (sz != trg_size)
			die("object %s inconsistent object length (%lu vs %lu)",
1892 1893
			    oid_to_hex(&trg_entry->idx.oid), sz,
			    trg_size);
1894
		*mem_usage += sz;
1895 1896
	}
	if (!src->data) {
N
Nicolas Pitre 已提交
1897
		read_lock();
1898
		src->data = read_object_file(&src_entry->idx.oid, &type, &sz);
N
Nicolas Pitre 已提交
1899
		read_unlock();
1900 1901 1902 1903 1904
		if (!src->data) {
			if (src_entry->preferred_base) {
				static int warned = 0;
				if (!warned++)
					warning("object %s cannot be read",
1905
						oid_to_hex(&src_entry->idx.oid));
1906 1907 1908 1909 1910 1911 1912 1913
				/*
				 * 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;
			}
1914
			die("object %s cannot be read",
1915
			    oid_to_hex(&src_entry->idx.oid));
1916
		}
1917 1918
		if (sz != src_size)
			die("object %s inconsistent object length (%lu vs %lu)",
1919 1920
			    oid_to_hex(&src_entry->idx.oid), sz,
			    src_size);
1921
		*mem_usage += sz;
1922 1923 1924
	}
	if (!src->index) {
		src->index = create_delta_index(src->data, src_size);
1925 1926 1927 1928 1929 1930
		if (!src->index) {
			static int warned = 0;
			if (!warned++)
				warning("suboptimal pack - out of memory");
			return 0;
		}
1931
		*mem_usage += sizeof_delta_index(src->index);
1932 1933 1934
	}

	delta_buf = create_delta(src->index, trg->data, trg_size, &delta_size, max_size);
1935
	if (!delta_buf)
1936
		return 0;
1937

N
Nicolas Pitre 已提交
1938
	if (trg_entry->delta) {
1939 1940
		/* Prefer only shallower same-sized deltas. */
		if (delta_size == trg_entry->delta_size &&
1941
		    src->depth + 1 >= trg->depth) {
1942 1943 1944
			free(delta_buf);
			return 0;
		}
1945
	}
N
Nicolas Pitre 已提交
1946

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

1967 1968 1969 1970
	trg_entry->delta = src_entry;
	trg_entry->delta_size = delta_size;
	trg->depth = src->depth + 1;

1971
	return 1;
1972 1973
}

1974
static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
1975
{
1976 1977 1978 1979 1980 1981 1982 1983 1984
	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;
1985 1986
}

1987
static unsigned long free_unpacked(struct unpacked *n)
1988
{
1989
	unsigned long freed_mem = sizeof_delta_index(n->index);
1990 1991 1992
	free_delta_index(n->index);
	n->index = NULL;
	if (n->data) {
1993
		freed_mem += n->entry->size;
1994
		FREE_AND_NULL(n->data);
1995 1996
	}
	n->entry = NULL;
1997
	n->depth = 0;
1998
	return freed_mem;
1999 2000
}

2001
static void find_deltas(struct object_entry **list, unsigned *list_size,
2002
			int window, int depth, unsigned *processed)
2003
{
2004
	uint32_t i, idx = 0, count = 0;
2005
	struct unpacked *array;
2006
	unsigned long mem_usage = 0;
2007

2008
	array = xcalloc(window, sizeof(struct unpacked));
2009

2010
	for (;;) {
2011
		struct object_entry *entry;
2012
		struct unpacked *n = array + idx;
2013
		int j, max_depth, best_base = -1;
2014

2015 2016 2017 2018 2019
		progress_lock();
		if (!*list_size) {
			progress_unlock();
			break;
		}
2020
		entry = *list++;
2021 2022 2023 2024 2025 2026 2027
		(*list_size)--;
		if (!entry->preferred_base) {
			(*processed)++;
			display_progress(progress_state, *processed);
		}
		progress_unlock();

2028
		mem_usage -= free_unpacked(n);
2029
		n->entry = entry;
2030

2031
		while (window_memory_limit &&
2032
		       mem_usage > window_memory_limit &&
2033 2034
		       count > 1) {
			uint32_t tail = (idx + window - count) % window;
2035
			mem_usage -= free_unpacked(array + tail);
2036 2037 2038
			count--;
		}

2039 2040 2041 2042 2043 2044
		/* We do not compute delta to *create* objects we are not
		 * going to pack.
		 */
		if (entry->preferred_base)
			goto next;

2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056
		/*
		 * 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 已提交
2057 2058
		j = window;
		while (--j > 0) {
2059
			int ret;
2060
			uint32_t other_idx = idx + j;
2061
			struct unpacked *m;
L
Linus Torvalds 已提交
2062 2063
			if (other_idx >= window)
				other_idx -= window;
2064 2065 2066
			m = array + other_idx;
			if (!m->entry)
				break;
2067
			ret = try_delta(n, m, max_depth, &mem_usage);
2068
			if (ret < 0)
2069
				break;
2070 2071
			else if (ret > 0)
				best_base = other_idx;
2072
		}
2073

2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096
		/*
		 * 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();
		}

2097 2098 2099 2100
		/* 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.
		 */
2101
		if (entry->delta && max_depth <= n->depth)
2102
			continue;
2103

2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120
		/*
		 * 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;
		}

2121
		next:
2122
		idx++;
2123 2124
		if (count + 1 < window)
			count++;
2125 2126
		if (idx >= window)
			idx = 0;
2127
	}
2128

2129
	for (i = 0; i < window; ++i) {
2130
		free_delta_index(array[i].index);
2131
		free(array[i].data);
2132
	}
2133
	free(array);
2134 2135
}

2136
#ifndef NO_PTHREADS
N
Nicolas Pitre 已提交
2137

2138 2139 2140
static void try_to_free_from_threads(size_t size)
{
	read_lock();
2141
	release_pack_memory(size);
2142 2143 2144
	read_unlock();
}

2145
static try_to_free_t old_try_to_free_routine;
2146

2147 2148 2149 2150 2151 2152 2153 2154 2155
/*
 * 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 已提交
2156 2157 2158 2159
struct thread_params {
	pthread_t thread;
	struct object_entry **list;
	unsigned list_size;
2160
	unsigned remaining;
N
Nicolas Pitre 已提交
2161 2162
	int window;
	int depth;
2163 2164 2165 2166
	int working;
	int data_ready;
	pthread_mutex_t mutex;
	pthread_cond_t cond;
N
Nicolas Pitre 已提交
2167 2168 2169
	unsigned *processed;
};

2170 2171 2172 2173 2174 2175 2176
static pthread_cond_t progress_cond;

/*
 * Mutex and conditional variable can't be statically-initialized on Windows.
 */
static void init_threaded_search(void)
{
2177
	init_recursive_mutex(&read_mutex);
2178 2179 2180
	pthread_mutex_init(&cache_mutex, NULL);
	pthread_mutex_init(&progress_mutex, NULL);
	pthread_cond_init(&progress_cond, NULL);
2181
	old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
2182 2183 2184 2185
}

static void cleanup_threaded_search(void)
{
2186
	set_try_to_free_routine(old_try_to_free_routine);
2187 2188 2189 2190 2191
	pthread_cond_destroy(&progress_cond);
	pthread_mutex_destroy(&read_mutex);
	pthread_mutex_destroy(&cache_mutex);
	pthread_mutex_destroy(&progress_mutex);
}
2192

N
Nicolas Pitre 已提交
2193 2194
static void *threaded_find_deltas(void *arg)
{
2195 2196
	struct thread_params *me = arg;

2197
	progress_lock();
2198
	while (me->remaining) {
2199 2200
		progress_unlock();

2201
		find_deltas(me->list, &me->remaining,
2202
			    me->window, me->depth, me->processed);
2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221

		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);
2222 2223

		progress_lock();
2224
	}
2225
	progress_unlock();
2226 2227
	/* leave ->working 1 so that this doesn't get more work assigned */
	return NULL;
N
Nicolas Pitre 已提交
2228 2229 2230 2231 2232
}

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

2236 2237
	init_threaded_search();

2238
	if (delta_search_threads <= 1) {
2239
		find_deltas(list, &list_size, window, depth, processed);
2240
		cleanup_threaded_search();
2241 2242
		return;
	}
2243
	if (progress > pack_to_stdout)
2244
		fprintf(stderr, "Delta compression using up to %d threads.\n",
2245
				delta_search_threads);
2246
	p = xcalloc(delta_search_threads, sizeof(*p));
2247

2248
	/* Partition the work amongst work threads. */
2249
	for (i = 0; i < delta_search_threads; i++) {
2250 2251
		unsigned sub_size = list_size / (delta_search_threads - i);

2252 2253 2254 2255
		/* 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 已提交
2256 2257 2258
		p[i].window = window;
		p[i].depth = depth;
		p[i].processed = processed;
2259 2260
		p[i].working = 1;
		p[i].data_ready = 0;
2261

2262
		/* try to split chunks on "path" boundaries */
2263 2264
		while (sub_size && sub_size < list_size &&
		       list[sub_size]->hash &&
2265 2266 2267
		       list[sub_size]->hash == list[sub_size-1]->hash)
			sub_size++;

2268 2269 2270
		p[i].list = list;
		p[i].list_size = sub_size;
		p[i].remaining = sub_size;
2271

2272 2273 2274 2275
		list += sub_size;
		list_size -= sub_size;
	}

2276 2277 2278 2279
	/* Start work threads. */
	for (i = 0; i < delta_search_threads; i++) {
		if (!p[i].list_size)
			continue;
2280 2281
		pthread_mutex_init(&p[i].mutex, NULL);
		pthread_cond_init(&p[i].cond, NULL);
2282 2283 2284 2285 2286 2287 2288
		ret = pthread_create(&p[i].thread, NULL,
				     threaded_find_deltas, &p[i]);
		if (ret)
			die("unable to create thread: %s", strerror(ret));
		active_threads++;
	}

2289 2290 2291 2292 2293 2294 2295 2296
	/*
	 * 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.
	 */
2297 2298
	while (active_threads) {
		struct thread_params *target = NULL;
2299 2300 2301 2302
		struct thread_params *victim = NULL;
		unsigned sub_size = 0;

		progress_lock();
2303 2304 2305 2306 2307 2308 2309 2310 2311
		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);
		}

2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323
		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--;
			}
2324 2325 2326 2327 2328 2329 2330 2331 2332 2333
			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;
			}
2334 2335 2336 2337 2338 2339
			target->list = list;
			victim->list_size -= sub_size;
			victim->remaining -= sub_size;
		}
		target->list_size = sub_size;
		target->remaining = sub_size;
2340 2341 2342 2343 2344 2345 2346
		target->working = 1;
		progress_unlock();

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

2348
		if (!sub_size) {
2349
			pthread_join(target->thread, NULL);
2350 2351
			pthread_cond_destroy(&target->cond);
			pthread_mutex_destroy(&target->mutex);
2352
			active_threads--;
2353
		}
2354
	}
2355
	cleanup_threaded_search();
2356
	free(p);
N
Nicolas Pitre 已提交
2357 2358 2359
}

#else
2360
#define ll_find_deltas(l, s, w, d, p)	find_deltas(l, &s, w, d, p)
N
Nicolas Pitre 已提交
2361 2362
#endif

2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376
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;

2377
	tag = lookup_tag(oid);
2378 2379 2380 2381 2382
	while (1) {
		if (!tag || parse_tag(tag) || !tag->tagged)
			die("unable to pack objects reachable from tag %s",
			    oid_to_hex(oid));

2383
		add_object_entry(&tag->object.oid, OBJ_TAG, NULL, 0);
2384 2385 2386 2387 2388 2389 2390 2391

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

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

2392
static int add_ref_tag(const char *path, const struct object_id *oid, int flag, void *cb_data)
2393
{
2394
	struct object_id peeled;
2395

2396
	if (starts_with(path, "refs/tags/") && /* is a tag? */
2397
	    !peel_ref(path, &peeled)    && /* peelable? */
2398
	    packlist_find(&to_pack, peeled.hash, NULL))      /* object packed? */
2399
		add_tag_chain(oid);
2400 2401 2402
	return 0;
}

2403 2404
static void prepare_pack(int window, int depth)
{
2405
	struct object_entry **delta_list;
2406 2407
	uint32_t i, nr_deltas;
	unsigned n;
2408

2409
	get_object_details();
2410

2411 2412 2413 2414 2415 2416 2417 2418 2419 2420
	/*
	 * 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;

2421
	if (!to_pack.nr_objects || !window || !depth)
2422 2423
		return;

J
Jeff King 已提交
2424
	ALLOC_ARRAY(delta_list, to_pack.nr_objects);
2425 2426
	nr_deltas = n = 0;

2427 2428
	for (i = 0; i < to_pack.nr_objects; i++) {
		struct object_entry *entry = to_pack.objects + i;
2429 2430 2431

		if (entry->delta)
			/* This happens if we decided to reuse existing
2432
			 * delta from a pack.  "reuse_delta &&" is implied.
2433 2434 2435 2436 2437 2438 2439 2440 2441
			 */
			continue;

		if (entry->size < 50)
			continue;

		if (entry->no_try_delta)
			continue;

2442
		if (!entry->preferred_base) {
2443
			nr_deltas++;
2444
			if (oe_type(entry) < 0)
2445
				die("unable to get type of object %s",
2446
				    oid_to_hex(&entry->idx.oid));
2447
		} else {
2448
			if (oe_type(entry) < 0) {
2449 2450 2451 2452 2453 2454
				/*
				 * This object is not found, but we
				 * don't have to include it anyway.
				 */
				continue;
			}
2455
		}
2456 2457 2458 2459

		delta_list[n++] = entry;
	}

2460
	if (nr_deltas && n > 1) {
2461 2462
		unsigned nr_done = 0;
		if (progress)
2463
			progress_state = start_progress(_("Compressing objects"),
2464
							nr_deltas);
R
René Scharfe 已提交
2465
		QSORT(delta_list, n, type_size_sort);
N
Nicolas Pitre 已提交
2466
		ll_find_deltas(delta_list, n, window+1, depth, &nr_done);
N
Nicolas Pitre 已提交
2467
		stop_progress(&progress_state);
2468 2469
		if (nr_done != nr_deltas)
			die("inconsistency with delta count");
2470
	}
2471
	free(delta_list);
2472 2473
}

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

2529
static void read_object_list_from_stdin(void)
2530
{
2531 2532 2533
	char line[GIT_MAX_HEXSZ + 1 + PATH_MAX + 2];
	struct object_id oid;
	const char *p;
2534

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

2556
		add_preferred_base_object(p + 1);
2557
		add_object_entry(&oid, OBJ_NONE, p + 1, 0);
2558
	}
2559 2560
}

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

2564
static void show_commit(struct commit *commit, void *data)
2565
{
2566
	add_object_entry(&commit->object.oid, OBJ_COMMIT, NULL, 0);
J
Junio C Hamano 已提交
2567
	commit->object.flags |= OBJECT_ADDED;
2568 2569 2570

	if (write_bitmap_index)
		index_commit_for_bitmap(commit);
2571 2572
}

2573
static void show_object(struct object *obj, const char *name, void *data)
2574
{
2575
	add_preferred_base_object(name);
2576
	add_object_entry(&obj->oid, obj->type, name, 0);
2577
	obj->flags |= OBJECT_ADDED;
2578 2579
}

2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593
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);
}

2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607
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);
}

2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621
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;
2622
		fetch_if_missing = 0;
2623 2624 2625 2626
		fn_show_object = show_object__ma_allow_any;
		return 0;
	}

2627 2628 2629 2630 2631 2632 2633
	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;
	}

2634 2635 2636 2637
	die(_("invalid value for --missing"));
	return 0;
}

2638 2639
static void show_edge(struct commit *commit)
{
2640
	add_preferred_base(&commit->object.oid);
2641 2642
}

J
Junio C Hamano 已提交
2643 2644 2645 2646 2647 2648
struct in_pack_object {
	off_t offset;
	struct object *object;
};

struct in_pack {
2649 2650
	unsigned int alloc;
	unsigned int nr;
J
Junio C Hamano 已提交
2651 2652 2653 2654 2655
	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 已提交
2656
	in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->oid.hash, p);
J
Junio C Hamano 已提交
2657 2658 2659 2660 2661 2662
	in_pack->array[in_pack->nr].object = object;
	in_pack->nr++;
}

/*
 * Compare the objects in the offset order, in order to emulate the
2663
 * "git rev-list --objects" output that produced the pack originally.
J
Junio C Hamano 已提交
2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674
 */
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
2675
		return oidcmp(&a->object->oid, &b->object->oid);
J
Junio C Hamano 已提交
2676 2677 2678 2679 2680 2681 2682 2683 2684 2685
}

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));

2686
	for (p = get_packed_git(the_repository); p; p = p->next) {
2687
		struct object_id oid;
J
Junio C Hamano 已提交
2688 2689
		struct object *o;

2690
		if (!p->pack_local || p->pack_keep)
J
Junio C Hamano 已提交
2691 2692 2693 2694 2695 2696 2697 2698 2699
			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++) {
2700 2701
			nth_packed_object_oid(&oid, p, i);
			o = lookup_unknown_object(oid.hash);
J
Junio C Hamano 已提交
2702 2703 2704 2705 2706 2707 2708
			if (!(o->flags & OBJECT_ADDED))
				mark_in_pack_object(o, p, &in_pack);
			o->flags |= OBJECT_ADDED;
		}
	}

	if (in_pack.nr) {
R
René Scharfe 已提交
2709
		QSORT(in_pack.array, in_pack.nr, ofscmp);
J
Junio C Hamano 已提交
2710 2711
		for (i = 0; i < in_pack.nr; i++) {
			struct object *o = in_pack.array[i].object;
2712
			add_object_entry(&o->oid, o->type, "", 0);
J
Junio C Hamano 已提交
2713 2714 2715 2716 2717
		}
	}
	free(in_pack.array);
}

2718
static int add_loose_object(const struct object_id *oid, const char *path,
2719 2720
			    void *data)
{
2721
	enum object_type type = oid_object_info(oid, NULL);
2722 2723 2724 2725 2726 2727

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

2728
	add_object_entry(oid, type, "", 0);
2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743
	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);
}

2744
static int has_sha1_pack_kept_or_nonlocal(const struct object_id *oid)
2745 2746 2747 2748
{
	static struct packed_git *last_found = (void *)1;
	struct packed_git *p;

2749 2750
	p = (last_found != (void *)1) ? last_found :
					get_packed_git(the_repository);
2751 2752 2753

	while (p) {
		if ((!p->pack_local || p->pack_keep) &&
2754
			find_pack_entry_one(oid->hash, p)) {
2755 2756 2757 2758
			last_found = p;
			return 1;
		}
		if (p == last_found)
2759
			p = get_packed_git(the_repository);
2760 2761 2762 2763 2764 2765 2766 2767
		else
			p = p->next;
		if (p == last_found)
			p = p->next;
	}
	return 0;
}

2768 2769 2770 2771 2772 2773 2774
/*
 * 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.
 */
2775
static struct oid_array recent_objects;
2776

2777
static int loosened_object_can_be_discarded(const struct object_id *oid,
2778
					    timestamp_t mtime)
2779 2780 2781 2782 2783
{
	if (!unpack_unreachable_expiration)
		return 0;
	if (mtime > unpack_unreachable_expiration)
		return 0;
2784
	if (oid_array_lookup(&recent_objects, oid) >= 0)
2785
		return 0;
2786 2787 2788
	return 1;
}

2789 2790 2791 2792
static void loosen_unused_packed_objects(struct rev_info *revs)
{
	struct packed_git *p;
	uint32_t i;
2793
	struct object_id oid;
2794

2795
	for (p = get_packed_git(the_repository); p; p = p->next) {
2796
		if (!p->pack_local || p->pack_keep)
2797 2798 2799 2800 2801 2802
			continue;

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

		for (i = 0; i < p->num_objects; i++) {
2803 2804
			nth_packed_object_oid(&oid, p, i);
			if (!packlist_find(&to_pack, oid.hash, NULL) &&
2805
			    !has_sha1_pack_kept_or_nonlocal(&oid) &&
2806
			    !loosened_object_can_be_discarded(&oid, p->mtime))
2807
				if (force_object_loose(&oid, p->mtime))
2808 2809 2810 2811 2812
					die("unable to force loose object");
		}
	}
}

2813
/*
2814 2815 2816
 * 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.
2817 2818 2819
 */
static int pack_options_allow_reuse(void)
{
2820 2821 2822 2823 2824
	return pack_to_stdout &&
	       allow_ofs_delta &&
	       !ignore_packed_keep &&
	       (!local || !have_non_local_packs) &&
	       !incremental;
2825 2826
}

2827 2828 2829 2830 2831
static int get_object_list_from_bitmap(struct rev_info *revs)
{
	if (prepare_bitmap_walk(revs) < 0)
		return -1;

2832 2833
	if (pack_options_allow_reuse() &&
	    !reuse_partial_packfile_from_bitmap(
2834 2835 2836 2837 2838
			&reuse_packfile,
			&reuse_packfile_objects,
			&reuse_packfile_offset)) {
		assert(reuse_packfile_objects);
		nr_result += reuse_packfile_objects;
2839
		display_progress(progress_state, nr_result);
2840 2841 2842 2843 2844 2845
	}

	traverse_bitmap_commit_list(&add_object_entry_from_bitmap);
	return 0;
}

2846
static void record_recent_object(struct object *obj,
2847
				 const char *name,
2848 2849
				 void *data)
{
2850
	oid_array_append(&recent_objects, &obj->oid);
2851 2852 2853 2854
}

static void record_recent_commit(struct commit *commit, void *data)
{
2855
	oid_array_append(&recent_objects, &commit->object.oid);
2856 2857
}

2858
static void get_object_list(int ac, const char **av)
2859 2860 2861 2862 2863 2864 2865 2866 2867
{
	struct rev_info revs;
	char line[1000];
	int flags = 0;

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

2868 2869 2870
	/* make sure shallows are read */
	is_repository_shallow();

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

2897 2898 2899
	if (use_bitmap_index && !get_object_list_from_bitmap(&revs))
		return;

2900 2901
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
2902
	mark_edges_uninteresting(&revs, show_edge);
2903 2904 2905 2906 2907 2908

	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 已提交
2909

2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920
	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 已提交
2921 2922
	if (keep_unreachable)
		add_objects_in_unpacked_packs(&revs);
2923 2924
	if (pack_loose_unreachable)
		add_unreachable_loose_objects();
2925 2926
	if (unpack_unreachable)
		loosen_unused_packed_objects(&revs);
2927

2928
	oid_array_clear(&recent_objects);
2929 2930
}

2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945
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;
}

2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960
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;
}

2961 2962 2963
int cmd_pack_objects(int argc, const char **argv, const char *prefix)
{
	int use_internal_rev_list = 0;
2964
	int thin = 0;
2965
	int shallow = 0;
2966
	int all_progress_implied = 0;
J
Jeff King 已提交
2967
	struct argv_array rp = ARGV_ARRAY_INIT;
2968
	int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0;
2969
	int rev_list_index = 0;
2970 2971
	struct option pack_objects_options[] = {
		OPT_SET_INT('q', "quiet", &progress,
2972
			    N_("do not show progress meter"), 0),
2973
		OPT_SET_INT(0, "progress", &progress,
2974
			    N_("show progress meter"), 1),
2975
		OPT_SET_INT(0, "all-progress", &progress,
2976
			    N_("show progress meter during object writing phase"), 2),
2977 2978
		OPT_BOOL(0, "all-progress-implied",
			 &all_progress_implied,
2979 2980 2981
			 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"),
2982
		  0, option_parse_index_version },
2983 2984
		OPT_MAGNITUDE(0, "max-pack-size", &pack_size_limit,
			      N_("maximum size of each output pack file")),
2985
		OPT_BOOL(0, "local", &local,
2986
			 N_("ignore borrowed objects from alternate object store")),
2987
		OPT_BOOL(0, "incremental", &incremental,
2988
			 N_("ignore packed objects")),
2989
		OPT_INTEGER(0, "window", &window,
2990
			    N_("limit pack window by objects")),
2991 2992
		OPT_MAGNITUDE(0, "window-memory", &window_memory_limit,
			      N_("limit pack window by memory in addition to object limit")),
2993
		OPT_INTEGER(0, "depth", &depth,
2994
			    N_("maximum length of delta chain allowed in the resulting pack")),
2995
		OPT_BOOL(0, "reuse-delta", &reuse_delta,
2996
			 N_("reuse existing deltas")),
2997
		OPT_BOOL(0, "reuse-object", &reuse_object,
2998
			 N_("reuse existing objects")),
2999
		OPT_BOOL(0, "delta-base-offset", &allow_ofs_delta,
3000
			 N_("use OFS_DELTA objects")),
3001
		OPT_INTEGER(0, "threads", &delta_search_threads,
3002
			    N_("use threads when searching for best delta matches")),
3003
		OPT_BOOL(0, "non-empty", &non_empty,
3004
			 N_("do not create an empty pack output")),
3005
		OPT_BOOL(0, "revs", &use_internal_rev_list,
3006
			 N_("read revision arguments from standard input")),
3007
		{ OPTION_SET_INT, 0, "unpacked", &rev_list_unpacked, NULL,
3008
		  N_("limit the objects to those that are not yet packed"),
3009 3010
		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
		{ OPTION_SET_INT, 0, "all", &rev_list_all, NULL,
3011
		  N_("include objects reachable from any reference"),
3012 3013
		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
		{ OPTION_SET_INT, 0, "reflog", &rev_list_reflog, NULL,
3014
		  N_("include objects referred by reflog entries"),
3015
		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
3016 3017 3018
		{ 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 },
3019
		OPT_BOOL(0, "stdout", &pack_to_stdout,
3020
			 N_("output pack to stdout")),
3021
		OPT_BOOL(0, "include-tag", &include_tag,
3022
			 N_("include tag objects that refer to objects to be packed")),
3023
		OPT_BOOL(0, "keep-unreachable", &keep_unreachable,
3024
			 N_("keep unreachable objects")),
3025 3026
		OPT_BOOL(0, "pack-loose-unreachable", &pack_loose_unreachable,
			 N_("pack loose unreachable objects")),
3027 3028
		{ OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"),
		  N_("unpack unreachable objects newer than <time>"),
3029
		  PARSE_OPT_OPTARG, option_parse_unpack_unreachable },
3030
		OPT_BOOL(0, "thin", &thin,
3031
			 N_("create thin packs")),
3032 3033
		OPT_BOOL(0, "shallow", &shallow,
			 N_("create packs suitable for shallow fetches")),
3034
		OPT_BOOL(0, "honor-pack-keep", &ignore_packed_keep,
3035
			 N_("ignore packs that have companion .keep file")),
3036
		OPT_INTEGER(0, "compression", &pack_compression_level,
3037
			    N_("pack compression level")),
3038
		OPT_SET_INT(0, "keep-true-parents", &grafts_replace_parents,
3039
			    N_("do not hide commits by grafts"), 0),
3040 3041
		OPT_BOOL(0, "use-bitmap-index", &use_bitmap_index,
			 N_("use a bitmap index if available to speed up counting objects")),
3042 3043
		OPT_BOOL(0, "write-bitmap-index", &write_bitmap_index,
			 N_("write a bitmap index together with the pack index")),
3044 3045 3046 3047
		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 },
3048 3049
		OPT_BOOL(0, "exclude-promisor-objects", &exclude_promisor_objects,
			 N_("do not pack objects in promisor packfiles")),
3050 3051
		OPT_END(),
	};
3052

3053 3054 3055
	if (DFS_NUM_STATES > (1 << OE_DFS_STATE_BITS))
		BUG("too many dfs states, increase OE_DFS_STATE_BITS");

3056
	check_replace_refs = 0;
3057

3058
	reset_pack_idx_option(&pack_idx_opts);
3059
	git_config(git_pack_config, NULL);
3060 3061

	progress = isatty(2);
3062 3063
	argc = parse_options(argc, argv, prefix, pack_objects_options,
			     pack_usage, 0);
3064

3065 3066 3067
	if (argc) {
		base_name = argv[0];
		argc--;
3068
	}
3069 3070
	if (pack_to_stdout != !base_name || argc)
		usage_with_options(pack_usage, pack_objects_options);
3071

3072 3073 3074 3075 3076 3077
	if (depth >= (1 << OE_DEPTH_BITS)) {
		warning(_("delta chain depth %d is too deep, forcing %d"),
			depth, (1 << OE_DEPTH_BITS) - 1);
		depth = (1 << OE_DEPTH_BITS) - 1;
	}

J
Jeff King 已提交
3078
	argv_array_push(&rp, "pack-objects");
3079 3080
	if (thin) {
		use_internal_rev_list = 1;
3081 3082 3083
		argv_array_push(&rp, shallow
				? "--objects-edge-aggressive"
				: "--objects-edge");
3084
	} else
J
Jeff King 已提交
3085
		argv_array_push(&rp, "--objects");
3086

3087 3088
	if (rev_list_all) {
		use_internal_rev_list = 1;
J
Jeff King 已提交
3089
		argv_array_push(&rp, "--all");
3090 3091 3092
	}
	if (rev_list_reflog) {
		use_internal_rev_list = 1;
J
Jeff King 已提交
3093
		argv_array_push(&rp, "--reflog");
3094
	}
3095 3096 3097
	if (rev_list_index) {
		use_internal_rev_list = 1;
		argv_array_push(&rp, "--indexed-objects");
3098 3099 3100
	}
	if (rev_list_unpacked) {
		use_internal_rev_list = 1;
J
Jeff King 已提交
3101
		argv_array_push(&rp, "--unpacked");
3102
	}
3103

3104 3105 3106 3107 3108 3109
	if (exclude_promisor_objects) {
		use_internal_rev_list = 1;
		fetch_if_missing = 0;
		argv_array_push(&rp, "--exclude-promisor-objects");
	}

3110 3111 3112 3113 3114 3115
	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);
3116 3117 3118 3119

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

3120 3121
#ifdef NO_PTHREADS
	if (delta_search_threads != 1)
3122
		warning("no threads support, ignoring --threads");
3123
#endif
3124 3125
	if (!pack_to_stdout && !pack_size_limit)
		pack_size_limit = pack_size_limit_cfg;
3126 3127
	if (pack_to_stdout && pack_size_limit)
		die("--max-pack-size cannot be used to build a pack for transfer.");
3128 3129 3130 3131
	if (pack_size_limit && pack_size_limit < 1024*1024) {
		warning("minimum pack size limit is 1 MiB");
		pack_size_limit = 1024*1024;
	}
3132

3133 3134
	if (!pack_to_stdout && thin)
		die("--thin cannot be used to build an indexable pack.");
3135

3136 3137
	if (keep_unreachable && unpack_unreachable)
		die("--keep-unreachable and --unpack-unreachable are incompatible.");
3138 3139
	if (!rev_list_all || !rev_list_reflog || !rev_list_index)
		unpack_unreachable_expiration = 0;
3140

3141 3142 3143 3144 3145 3146
	if (filter_options.choice) {
		if (!pack_to_stdout)
			die("cannot use --filter without --stdout.");
		use_bitmap_index = 0;
	}

3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163
	/*
	 * "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())
3164 3165
		use_bitmap_index = 0;

3166 3167 3168
	if (pack_to_stdout || !rev_list_all)
		write_bitmap_index = 0;

3169 3170 3171
	if (progress && all_progress_implied)
		progress = 2;

3172 3173
	if (ignore_packed_keep) {
		struct packed_git *p;
3174
		for (p = get_packed_git(the_repository); p; p = p->next)
3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186
			if (p->pack_local && p->pack_keep)
				break;
		if (!p) /* no keep-able packs found */
			ignore_packed_keep = 0;
	}
	if (local) {
		/*
		 * unlike ignore_packed_keep above, we do not want to
		 * unset "local" based on looking at packs, as it
		 * also covers non-local objects
		 */
		struct packed_git *p;
3187
		for (p = get_packed_git(the_repository); p; p = p->next) {
3188 3189 3190 3191 3192 3193
			if (!p->pack_local) {
				have_non_local_packs = 1;
				break;
			}
		}
	}
3194

3195
	if (progress)
3196
		progress_state = start_progress(_("Counting objects"), 0);
3197 3198
	if (!use_internal_rev_list)
		read_object_list_from_stdin();
3199
	else {
J
Jeff King 已提交
3200 3201
		get_object_list(rp.argc, rp.argv);
		argv_array_clear(&rp);
3202
	}
3203
	cleanup_preferred_base();
3204 3205
	if (include_tag && nr_result)
		for_each_ref(add_ref_tag, NULL);
N
Nicolas Pitre 已提交
3206
	stop_progress(&progress_state);
N
Nicolas Pitre 已提交
3207

3208
	if (non_empty && !nr_result)
3209
		return 0;
3210 3211
	if (nr_result)
		prepare_pack(window, depth);
3212
	write_pack_file();
3213
	if (progress)
3214 3215
		fprintf(stderr, "Total %"PRIu32" (delta %"PRIu32"),"
			" reused %"PRIu32" (delta %"PRIu32")\n",
3216
			written, written_delta, reused, reused_delta);
3217 3218
	return 0;
}