pack-objects.c 59.1 KB
Newer Older
1
#include "builtin.h"
2
#include "cache.h"
3
#include "attr.h"
4
#include "object.h"
5 6 7 8
#include "blob.h"
#include "commit.h"
#include "tag.h"
#include "tree.h"
9
#include "delta.h"
10
#include "pack.h"
11
#include "pack-revindex.h"
12
#include "csum-file.h"
J
Junio C Hamano 已提交
13
#include "tree-walk.h"
14 15 16
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
N
Nicolas Pitre 已提交
17
#include "progress.h"
18
#include "refs.h"
19
#include "thread-utils.h"
N
Nicolas Pitre 已提交
20

21
static const char pack_usage[] =
22
  "git pack-objects [ -q | --progress | --all-progress ]\n"
23
  "        [--all-progress-implied]\n"
24 25
  "        [--max-pack-size=<n>] [--local] [--incremental]\n"
  "        [--window=<n>] [--window-memory=<n>] [--depth=<n>]\n"
26
  "        [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset]\n"
27
  "        [--threads=<n>] [--non-empty] [--revs [--unpacked | --all]]\n"
28
  "        [--reflog] [--stdout | base-name] [--include-tag]\n"
29
  "        [--keep-unreachable | --unpack-unreachable]\n"
30
  "        [< ref-list | < object-list]";
31 32

struct object_entry {
G
Geert Bosch 已提交
33
	struct pack_idx_entry idx;
34 35
	unsigned long size;	/* uncompressed size */
	struct packed_git *in_pack; 	/* already in pack */
36
	off_t in_pack_offset;
37
	struct object_entry *delta;	/* delta base object */
38
	struct object_entry *delta_child; /* deltified objects who bases me */
39 40 41
	struct object_entry *delta_sibling; /* other deltified objects who
					     * uses the same base as me
					     */
42
	void *delta_data;	/* cached delta (uncompressed) */
43
	unsigned long delta_size;	/* delta data size (uncompressed) */
44
	unsigned long z_delta_size;	/* delta data size (compressed) */
45
	unsigned int hash;	/* name hint hash */
46 47 48 49
	enum object_type type;
	enum object_type in_pack_type;	/* could be delta */
	unsigned char in_pack_header_size;
	unsigned char preferred_base; /* we do not pack this, but is available
50
				       * to be used as the base object to delta
51 52
				       * objects against.
				       */
53
	unsigned char no_try_delta;
54 55
};

56
/*
57
 * Objects we are going to pack are collected in objects array (dynamically
58 59 60 61
 * expanded).  nr_objects & nr_alloc controls this array.  They are stored
 * in the order we see -- typically rev-list --objects order that gives us
 * nice "minimum seek" order.
 */
62
static struct object_entry *objects;
63
static struct pack_idx_entry **written_list;
64
static uint32_t nr_objects, nr_alloc, nr_result, nr_written;
65

66
static int non_empty;
67
static int reuse_delta = 1, reuse_object = 1;
J
Junio C Hamano 已提交
68
static int keep_unreachable, unpack_unreachable, include_tag;
69 70
static int local;
static int incremental;
71
static int ignore_packed_keep;
72
static int allow_ofs_delta;
73
static const char *base_name;
J
Junio C Hamano 已提交
74
static int progress = 1;
75
static int window = 10;
76
static unsigned long pack_size_limit, pack_size_limit_cfg;
77
static int depth = 50;
78
static int delta_search_threads;
79
static int pack_to_stdout;
80
static int num_preferred_base;
81
static struct progress *progress_state;
82 83
static int pack_compression_level = Z_DEFAULT_COMPRESSION;
static int pack_compression_seen;
84

85
static unsigned long delta_cache_size = 0;
86
static unsigned long max_delta_cache_size = 256 * 1024 * 1024;
87
static unsigned long cache_max_small_delta_size = 1000;
88

89 90
static unsigned long window_memory_limit = 0;

91 92
/*
 * The object names in objects array are hashed with this hashtable,
93
 * to help looking up the entry by object name.
94 95
 * This hashtable is built after all the objects are seen.
 */
96 97
static int *object_ix;
static int object_ix_hashsz;
98 99 100 101

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

105

N
Nicolas Pitre 已提交
106
static void *get_delta(struct object_entry *entry)
107
{
N
Nicolas Pitre 已提交
108 109
	unsigned long size, base_size, delta_size;
	void *buf, *base_buf, *delta_buf;
110
	enum object_type type;
111

N
Nicolas Pitre 已提交
112 113 114 115 116
	buf = read_sha1_file(entry->idx.sha1, &type, &size);
	if (!buf)
		die("unable to read %s", sha1_to_hex(entry->idx.sha1));
	base_buf = read_sha1_file(entry->delta->idx.sha1, &type, &base_size);
	if (!base_buf)
G
Geert Bosch 已提交
117
		die("unable to read %s", sha1_to_hex(entry->delta->idx.sha1));
N
Nicolas Pitre 已提交
118
	delta_buf = diff_delta(base_buf, base_size,
119
			       buf, size, &delta_size, 0);
N
Nicolas Pitre 已提交
120
	if (!delta_buf || delta_size != entry->delta_size)
J
Junio C Hamano 已提交
121
		die("delta size changed");
N
Nicolas Pitre 已提交
122 123
	free(buf);
	free(base_buf);
124 125 126
	return delta_buf;
}

127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152
static unsigned long do_compress(void **pptr, unsigned long size)
{
	z_stream stream;
	void *in, *out;
	unsigned long maxsize;

	memset(&stream, 0, sizeof(stream));
	deflateInit(&stream, pack_compression_level);
	maxsize = deflateBound(&stream, size);

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

	stream.next_in = in;
	stream.avail_in = size;
	stream.next_out = out;
	stream.avail_out = maxsize;
	while (deflate(&stream, Z_FINISH) == Z_OK)
		; /* nothing */
	deflateEnd(&stream);

	free(in);
	return stream.total_out;
}

153 154 155 156
/*
 * we are going to reuse the existing object data as is.  make
 * sure it is not corrupt.
 */
157 158
static int check_pack_inflate(struct packed_git *p,
		struct pack_window **w_curs,
159 160
		off_t offset,
		off_t len,
161 162 163 164 165 166 167
		unsigned long expect)
{
	z_stream stream;
	unsigned char fakebuf[4096], *in;
	int st;

	memset(&stream, 0, sizeof(stream));
168
	git_inflate_init(&stream);
169 170 171 172 173
	do {
		in = use_pack(p, w_curs, offset, &stream.avail_in);
		stream.next_in = in;
		stream.next_out = fakebuf;
		stream.avail_out = sizeof(fakebuf);
174
		st = git_inflate(&stream, Z_FINISH);
175 176
		offset += stream.next_in - in;
	} while (st == Z_OK || st == Z_BUF_ERROR);
177
	git_inflate_end(&stream);
178 179 180 181 182 183 184 185
	return (st == Z_STREAM_END &&
		stream.total_out == expect &&
		stream.total_in == len) ? 0 : -1;
}

static void copy_pack_data(struct sha1file *f,
		struct packed_git *p,
		struct pack_window **w_curs,
186 187
		off_t offset,
		off_t len)
188 189 190 191 192 193 194
{
	unsigned char *in;
	unsigned int avail;

	while (len) {
		in = use_pack(p, w_curs, offset, &avail);
		if (avail > len)
195
			avail = (unsigned int)len;
196 197 198 199 200 201
		sha1write(f, in, avail);
		offset += avail;
		len -= avail;
	}
}

202
static unsigned long write_object(struct sha1file *f,
203 204
				  struct object_entry *entry,
				  off_t write_offset)
205
{
206
	unsigned long size, limit, datalen;
207
	void *buf;
208
	unsigned char header[10], dheader[10];
209
	unsigned hdrlen;
210 211
	enum object_type type;
	int usable_delta, to_reuse;
212

213 214 215
	if (!pack_to_stdout)
		crc32_begin(f);

216 217
	type = entry->type;

218
	/* apply size limit if limited packsize and not first object */
219 220 221 222 223 224 225 226 227 228
	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;
229 230 231 232 233 234 235 236 237 238 239 240

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

241
	if (!reuse_object)
242 243
		to_reuse = 0;	/* explicit */
	else if (!entry->in_pack)
244
		to_reuse = 0;	/* can't reuse what we don't have */
245
	else if (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA)
246 247 248
				/* check_object() decided it for us ... */
		to_reuse = usable_delta;
				/* ... but pack split may override that */
249
	else if (type != entry->in_pack_type)
250 251 252 253 254 255 256 257
		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.
				 */

258
	if (!to_reuse) {
259
		no_reuse:
N
Nicolas Pitre 已提交
260
		if (!usable_delta) {
261
			buf = read_sha1_file(entry->idx.sha1, &type, &size);
N
Nicolas Pitre 已提交
262
			if (!buf)
G
Geert Bosch 已提交
263
				die("unable to read %s", sha1_to_hex(entry->idx.sha1));
264 265
			/*
			 * make sure no cached delta data remains from a
M
Mike Ralphson 已提交
266
			 * previous attempt before a pack split occurred.
267 268 269 270
			 */
			free(entry->delta_data);
			entry->delta_data = NULL;
			entry->z_delta_size = 0;
N
Nicolas Pitre 已提交
271
		} else if (entry->delta_data) {
272
			size = entry->delta_size;
N
Nicolas Pitre 已提交
273 274
			buf = entry->delta_data;
			entry->delta_data = NULL;
275
			type = (allow_ofs_delta && entry->delta->idx.offset) ?
276
				OBJ_OFS_DELTA : OBJ_REF_DELTA;
277
		} else {
N
Nicolas Pitre 已提交
278
			buf = get_delta(entry);
N
Nicolas Pitre 已提交
279
			size = entry->delta_size;
280
			type = (allow_ofs_delta && entry->delta->idx.offset) ?
N
Nicolas Pitre 已提交
281
				OBJ_OFS_DELTA : OBJ_REF_DELTA;
282
		}
283 284 285 286 287

		if (entry->z_delta_size)
			datalen = entry->z_delta_size;
		else
			datalen = do_compress(&buf, size);
288

289 290
		/*
		 * The object header is a byte of 'type' followed by zero or
291
		 * more bytes of length.
292
		 */
293
		hdrlen = encode_in_pack_object_header(type, size, header);
294

295
		if (type == OBJ_OFS_DELTA) {
296 297 298 299 300
			/*
			 * Deltas with relative base contain an additional
			 * encoding of the relative offset for the delta
			 * base from this object's position in the pack.
			 */
G
Geert Bosch 已提交
301
			off_t ofs = entry->idx.offset - entry->delta->idx.offset;
302 303
			unsigned pos = sizeof(dheader) - 1;
			dheader[pos] = ofs & 127;
304
			while (ofs >>= 7)
305 306 307 308 309 310 311 312
				dheader[--pos] = 128 | (--ofs & 127);
			if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
				free(buf);
				return 0;
			}
			sha1write(f, header, hdrlen);
			sha1write(f, dheader + pos, sizeof(dheader) - pos);
			hdrlen += sizeof(dheader) - pos;
313
		} else if (type == OBJ_REF_DELTA) {
314 315 316 317
			/*
			 * Deltas with a base reference contain
			 * an additional 20 bytes for the base sha1.
			 */
318 319 320 321 322
			if (limit && hdrlen + 20 + datalen + 20 >= limit) {
				free(buf);
				return 0;
			}
			sha1write(f, header, hdrlen);
G
Geert Bosch 已提交
323
			sha1write(f, entry->delta->idx.sha1, 20);
324
			hdrlen += 20;
325 326 327 328 329 330
		} else {
			if (limit && hdrlen + datalen + 20 >= limit) {
				free(buf);
				return 0;
			}
			sha1write(f, header, hdrlen);
331
		}
332
		sha1write(f, buf, datalen);
333
		free(buf);
334
	}
335 336
	else {
		struct packed_git *p = entry->in_pack;
337
		struct pack_window *w_curs = NULL;
338
		struct revindex_entry *revidx;
339
		off_t offset;
340

341
		if (entry->delta)
342
			type = (allow_ofs_delta && entry->delta->idx.offset) ?
343
				OBJ_OFS_DELTA : OBJ_REF_DELTA;
344
		hdrlen = encode_in_pack_object_header(type, entry->size, header);
345

346
		offset = entry->in_pack_offset;
347
		revidx = find_pack_revindex(p, offset);
348 349
		datalen = revidx[1].offset - offset;
		if (!pack_to_stdout && p->index_version > 1 &&
350 351 352 353 354 355
		    check_pack_crc(p, &w_curs, offset, datalen, revidx->nr)) {
			error("bad packed object CRC for %s", sha1_to_hex(entry->idx.sha1));
			unuse_pack(&w_curs);
			goto no_reuse;
		}

356 357
		offset += entry->in_pack_header_size;
		datalen -= entry->in_pack_header_size;
358 359 360 361 362 363 364
		if (!pack_to_stdout && p->index_version == 1 &&
		    check_pack_inflate(p, &w_curs, offset, datalen, entry->size)) {
			error("corrupt packed object for %s", sha1_to_hex(entry->idx.sha1));
			unuse_pack(&w_curs);
			goto no_reuse;
		}

365
		if (type == OBJ_OFS_DELTA) {
G
Geert Bosch 已提交
366
			off_t ofs = entry->idx.offset - entry->delta->idx.offset;
367 368 369 370
			unsigned pos = sizeof(dheader) - 1;
			dheader[pos] = ofs & 127;
			while (ofs >>= 7)
				dheader[--pos] = 128 | (--ofs & 127);
371 372
			if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
				unuse_pack(&w_curs);
373
				return 0;
374
			}
375 376 377
			sha1write(f, header, hdrlen);
			sha1write(f, dheader + pos, sizeof(dheader) - pos);
			hdrlen += sizeof(dheader) - pos;
378
			reused_delta++;
379
		} else if (type == OBJ_REF_DELTA) {
380 381
			if (limit && hdrlen + 20 + datalen + 20 >= limit) {
				unuse_pack(&w_curs);
382
				return 0;
383
			}
384
			sha1write(f, header, hdrlen);
G
Geert Bosch 已提交
385
			sha1write(f, entry->delta->idx.sha1, 20);
386
			hdrlen += 20;
387
			reused_delta++;
388
		} else {
389 390
			if (limit && hdrlen + datalen + 20 >= limit) {
				unuse_pack(&w_curs);
391
				return 0;
392
			}
393 394
			sha1write(f, header, hdrlen);
		}
395
		copy_pack_data(f, p, &w_curs, offset, datalen);
396
		unuse_pack(&w_curs);
397
		reused++;
398
	}
399
	if (usable_delta)
400
		written_delta++;
401
	written++;
402
	if (!pack_to_stdout)
G
Geert Bosch 已提交
403
		entry->idx.crc32 = crc32_end(f);
404 405 406
	return hdrlen + datalen;
}

407
static int write_one(struct sha1file *f,
408
			       struct object_entry *e,
409
			       off_t *offset)
410
{
411 412 413
	unsigned long size;

	/* offset is non zero if object is written already. */
G
Geert Bosch 已提交
414
	if (e->idx.offset || e->preferred_base)
415
		return -1;
416

417 418 419
	/* if we are deltified, write out base object first. */
	if (e->delta && !write_one(f, e->delta, offset))
		return 0;
420

421 422
	e->idx.offset = *offset;
	size = write_object(f, e, *offset);
423
	if (!size) {
G
Geert Bosch 已提交
424
		e->idx.offset = 0;
425 426
		return 0;
	}
427
	written_list[nr_written++] = &e->idx;
428 429

	/* make sure off_t is sufficiently large not to wrap */
430
	if (signed_add_overflows(*offset, size))
431
		die("pack too large for current definition of off_t");
432 433
	*offset += size;
	return 1;
434 435
}

436
static void write_pack_file(void)
437
{
438
	uint32_t i = 0, j;
439
	struct sha1file *f;
440
	off_t offset;
441
	struct pack_header hdr;
442
	uint32_t nr_remaining = nr_result;
443
	time_t last_mtime = 0;
444

445
	if (progress > pack_to_stdout)
446
		progress_state = start_progress("Writing objects", nr_result);
447
	written_list = xmalloc(nr_objects * sizeof(*written_list));
448

449
	do {
G
Geert Bosch 已提交
450
		unsigned char sha1[20];
451
		char *pack_tmp_name = NULL;
G
Geert Bosch 已提交
452

453
		if (pack_to_stdout) {
N
Nicolas Pitre 已提交
454
			f = sha1fd_throughput(1, "<stdout>", progress_state);
455
		} else {
456 457
			char tmpname[PATH_MAX];
			int fd;
458 459
			fd = odb_mkstemp(tmpname, sizeof(tmpname),
					 "pack/tmp_pack_XXXXXX");
460 461 462 463 464 465 466 467 468 469
			pack_tmp_name = xstrdup(tmpname);
			f = sha1fd(fd, pack_tmp_name);
		}

		hdr.hdr_signature = htonl(PACK_SIGNATURE);
		hdr.hdr_version = htonl(PACK_VERSION);
		hdr.hdr_entries = htonl(nr_remaining);
		sha1write(f, &hdr, sizeof(hdr));
		offset = sizeof(hdr);
		nr_written = 0;
470 471 472 473 474
		for (; i < nr_objects; i++) {
			if (!write_one(f, objects + i, &offset))
				break;
			display_progress(progress_state, written);
		}
475

476 477 478 479
		/*
		 * Did we write the wrong # entries in the header?
		 * If so, rewrite it like in fast-import
		 */
480 481 482 483
		if (pack_to_stdout) {
			sha1close(f, sha1, CSUM_CLOSE);
		} else if (nr_written == nr_remaining) {
			sha1close(f, sha1, CSUM_FSYNC);
484
		} else {
485
			int fd = sha1close(f, sha1, 0);
486
			fixup_pack_header_footer(fd, sha1, pack_tmp_name,
487
						 nr_written, sha1, offset);
488
			close(fd);
489 490 491
		}

		if (!pack_to_stdout) {
492
			struct stat st;
L
Linus Torvalds 已提交
493 494
			const char *idx_tmp_name;
			char tmpname[PATH_MAX];
495

496 497
			idx_tmp_name = write_idx_file(NULL, written_list,
						      nr_written, sha1);
498

499
			snprintf(tmpname, sizeof(tmpname), "%s-%s.pack",
G
Geert Bosch 已提交
500
				 base_name, sha1_to_hex(sha1));
501
			free_pack_by_name(tmpname);
502
			if (adjust_shared_perm(pack_tmp_name))
503
				die_errno("unable to make temporary pack file readable");
504
			if (rename(pack_tmp_name, tmpname))
505
				die_errno("unable to rename temporary pack file");
506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527

			/*
			 * 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.
			 */
			if (stat(tmpname, &st) < 0) {
				warning("failed to stat %s: %s",
					tmpname, strerror(errno));
			} else if (!last_mtime) {
				last_mtime = st.st_mtime;
			} else {
				struct utimbuf utb;
				utb.actime = st.st_atime;
				utb.modtime = --last_mtime;
				if (utime(tmpname, &utb) < 0)
					warning("failed utime() on %s: %s",
						tmpname, strerror(errno));
			}

528
			snprintf(tmpname, sizeof(tmpname), "%s-%s.idx",
G
Geert Bosch 已提交
529
				 base_name, sha1_to_hex(sha1));
530
			if (adjust_shared_perm(idx_tmp_name))
531
				die_errno("unable to make temporary index file readable");
532
			if (rename(idx_tmp_name, tmpname))
533
				die_errno("unable to rename temporary index file");
534

L
Linus Torvalds 已提交
535
			free((void *) idx_tmp_name);
536
			free(pack_tmp_name);
G
Geert Bosch 已提交
537
			puts(sha1_to_hex(sha1));
538 539 540 541
		}

		/* mark written objects as written to previous pack */
		for (j = 0; j < nr_written; j++) {
542
			written_list[j]->offset = (off_t)-1;
543 544
		}
		nr_remaining -= nr_written;
545
	} while (nr_remaining && i < nr_objects);
546 547

	free(written_list);
N
Nicolas Pitre 已提交
548
	stop_progress(&progress_state);
549
	if (written != nr_result)
550 551
		die("wrote %"PRIu32" objects while expecting %"PRIu32,
			written, nr_result);
552 553
}

554 555 556 557 558 559 560
static int locate_object_entry_hash(const unsigned char *sha1)
{
	int i;
	unsigned int ui;
	memcpy(&ui, sha1, sizeof(unsigned int));
	i = ui % object_ix_hashsz;
	while (0 < object_ix[i]) {
G
Geert Bosch 已提交
561
		if (!hashcmp(sha1, objects[object_ix[i] - 1].idx.sha1))
562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582
			return i;
		if (++i == object_ix_hashsz)
			i = 0;
	}
	return -1 - i;
}

static struct object_entry *locate_object_entry(const unsigned char *sha1)
{
	int i;

	if (!object_ix_hashsz)
		return NULL;

	i = locate_object_entry_hash(sha1);
	if (0 <= i)
		return &objects[object_ix[i]-1];
	return NULL;
}

static void rehash_objects(void)
583
{
584
	uint32_t i;
585 586 587 588 589 590
	struct object_entry *oe;

	object_ix_hashsz = nr_objects * 3;
	if (object_ix_hashsz < 1024)
		object_ix_hashsz = 1024;
	object_ix = xrealloc(object_ix, sizeof(int) * object_ix_hashsz);
591
	memset(object_ix, 0, sizeof(int) * object_ix_hashsz);
592
	for (i = 0, oe = objects; i < nr_objects; i++, oe++) {
G
Geert Bosch 已提交
593
		int ix = locate_object_entry_hash(oe->idx.sha1);
594 595 596 597 598 599 600
		if (0 <= ix)
			continue;
		ix = -1 - ix;
		object_ix[ix] = i + 1;
	}
}

601
static unsigned name_hash(const char *name)
602
{
603
	unsigned c, hash = 0;
604

605 606 607
	if (!name)
		return 0;

608
	/*
609 610 611
	 * This effectively just creates a sortable number from the
	 * last sixteen non-whitespace characters. Last characters
	 * count "most", so things that end in ".c" sort together.
612
	 */
613 614 615 616 617
	while ((c = *name++) != 0) {
		if (isspace(c))
			continue;
		hash = (hash >> 2) + (c << 24);
	}
618 619 620
	return hash;
}

621 622 623 624 625
static void setup_delta_attr_check(struct git_attr_check *check)
{
	static struct git_attr *attr_delta;

	if (!attr_delta)
626
		attr_delta = git_attr("delta");
627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642

	check[0].attr = attr_delta;
}

static int no_try_delta(const char *path)
{
	struct git_attr_check check[1];

	setup_delta_attr_check(check);
	if (git_checkattr(path, ARRAY_SIZE(check), check))
		return 0;
	if (ATTR_FALSE(check->value))
		return 1;
	return 0;
}

643
static int add_object_entry(const unsigned char *sha1, enum object_type type,
644
			    const char *name, int exclude)
645 646
{
	struct object_entry *entry;
N
Nicolas Pitre 已提交
647
	struct packed_git *p, *found_pack = NULL;
648
	off_t found_offset = 0;
N
Nicolas Pitre 已提交
649
	int ix;
650
	unsigned hash = name_hash(name);
N
Nicolas Pitre 已提交
651 652 653 654 655

	ix = nr_objects ? locate_object_entry_hash(sha1) : -1;
	if (ix >= 0) {
		if (exclude) {
			entry = objects + object_ix[ix] - 1;
656 657
			if (!entry->preferred_base)
				nr_result--;
N
Nicolas Pitre 已提交
658 659 660 661
			entry->preferred_base = 1;
		}
		return 0;
	}
662

663 664 665
	if (!exclude && local && has_loose_object_nonlocal(sha1))
		return 0;

666 667 668 669 670 671
	for (p = packed_git; p; p = p->next) {
		off_t offset = find_pack_entry_one(sha1, p);
		if (offset) {
			if (!found_pack) {
				found_offset = offset;
				found_pack = p;
L
Linus Torvalds 已提交
672
			}
673 674 675 676 677 678
			if (exclude)
				break;
			if (incremental)
				return 0;
			if (local && !p->pack_local)
				return 0;
679 680
			if (ignore_packed_keep && p->pack_local && p->pack_keep)
				return 0;
L
Linus Torvalds 已提交
681 682
		}
	}
683

N
Nicolas Pitre 已提交
684 685
	if (nr_objects >= nr_alloc) {
		nr_alloc = (nr_alloc  + 1024) * 3 / 2;
686
		objects = xrealloc(objects, nr_alloc * sizeof(*entry));
687
	}
N
Nicolas Pitre 已提交
688 689

	entry = objects + nr_objects++;
690
	memset(entry, 0, sizeof(*entry));
G
Geert Bosch 已提交
691
	hashcpy(entry->idx.sha1, sha1);
692
	entry->hash = hash;
693 694
	if (type)
		entry->type = type;
N
Nicolas Pitre 已提交
695 696
	if (exclude)
		entry->preferred_base = 1;
697 698
	else
		nr_result++;
N
Nicolas Pitre 已提交
699 700 701 702
	if (found_pack) {
		entry->in_pack = found_pack;
		entry->in_pack_offset = found_offset;
	}
703 704 705

	if (object_ix_hashsz * 3 <= nr_objects * 4)
		rehash_objects();
N
Nicolas Pitre 已提交
706 707
	else
		object_ix[-1 - ix] = nr_objects;
708

N
Nicolas Pitre 已提交
709
	display_progress(progress_state, nr_objects);
N
Nicolas Pitre 已提交
710

711 712 713
	if (name && no_try_delta(name))
		entry->no_try_delta = 1;

N
Nicolas Pitre 已提交
714
	return 1;
715 716
}

717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749
struct pbase_tree_cache {
	unsigned char sha1[20];
	int ref;
	int temporary;
	void *tree_data;
	unsigned long tree_size;
};

static struct pbase_tree_cache *(pbase_tree_cache[256]);
static int pbase_tree_cache_ix(const unsigned char *sha1)
{
	return sha1[0] % ARRAY_SIZE(pbase_tree_cache);
}
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
	 * going to evict it nor find it through _get()
	 * mechanism -- this is for the toplevel node that
	 * would almost always change with any commit.
	 */
	struct pbase_tree_cache pcache;
} *pbase_tree;

static struct pbase_tree_cache *pbase_tree_get(const unsigned char *sha1)
{
	struct pbase_tree_cache *ent, *nent;
	void *data;
	unsigned long size;
750
	enum object_type type;
751 752 753 754 755 756 757 758 759 760
	int neigh;
	int my_ix = pbase_tree_cache_ix(sha1);
	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];
761
		if (ent && !hashcmp(ent->sha1, sha1)) {
762 763 764 765 766 767 768 769 770 771 772 773 774 775 776
			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.
	 */
777
	data = read_sha1_file(sha1, &type, &size);
778 779
	if (!data)
		return NULL;
780
	if (type != OBJ_TREE) {
781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802
		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;
	}
803
	hashcpy(nent->sha1, sha1);
804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831
	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,
832 833
			     int cmplen,
			     const char *fullname)
834
{
835
	struct name_entry entry;
836
	int cmp;
837 838

	while (tree_entry(tree,&entry)) {
839 840
		if (S_ISGITLINK(entry.mode))
			continue;
841 842 843
		cmp = tree_entry_len(entry.path, entry.sha1) != cmplen ? 1 :
		      memcmp(name, entry.path, cmplen);
		if (cmp > 0)
844
			continue;
845 846
		if (cmp < 0)
			return;
847
		if (name[cmplen] != '/') {
848
			add_object_entry(entry.sha1,
849
					 object_type(entry.mode),
850
					 fullname, 1);
851 852
			return;
		}
853
		if (S_ISDIR(entry.mode)) {
854
			struct tree_desc sub;
855 856 857 858
			struct pbase_tree_cache *tree;
			const char *down = name+cmplen+1;
			int downlen = name_cmp_len(down);

859
			tree = pbase_tree_get(entry.sha1);
860 861
			if (!tree)
				return;
862
			init_tree_desc(&sub, tree->tree_data, tree->tree_size);
863

864
			add_pbase_object(&sub, down, downlen, fullname);
865 866 867 868
			pbase_tree_put(tree);
		}
	}
}
869

870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909
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) {
		int mi = (hi + lo) / 2;
		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)
{
	int pos = (!done_pbase_paths) ? -1 : done_pbase_path_pos(hash);
	if (0 <= pos)
		return 1;
	pos = -pos - 1;
	if (done_pbase_paths_alloc <= done_pbase_paths_num) {
		done_pbase_paths_alloc = alloc_nr(done_pbase_paths_alloc);
		done_pbase_paths = xrealloc(done_pbase_paths,
					    done_pbase_paths_alloc *
					    sizeof(unsigned));
	}
	done_pbase_paths_num++;
	if (pos < done_pbase_paths_num)
		memmove(done_pbase_paths + pos + 1,
			done_pbase_paths + pos,
			(done_pbase_paths_num - pos - 1) * sizeof(unsigned));
	done_pbase_paths[pos] = hash;
	return 0;
}

910
static void add_preferred_base_object(const char *name)
911 912
{
	struct pbase_tree *it;
913
	int cmplen;
914
	unsigned hash = name_hash(name);
915

916
	if (!num_preferred_base || check_pbase_path(hash))
917 918
		return;

919
	cmplen = name_cmp_len(name);
920 921
	for (it = pbase_tree; it; it = it->next) {
		if (cmplen == 0) {
922
			add_object_entry(it->pcache.sha1, OBJ_TREE, NULL, 1);
923 924 925
		}
		else {
			struct tree_desc tree;
926
			init_tree_desc(&tree, it->pcache.tree_data, it->pcache.tree_size);
927
			add_pbase_object(&tree, name, cmplen, name);
928
		}
929 930 931
	}
}

932
static void add_preferred_base(unsigned char *sha1)
933
{
934 935 936 937
	struct pbase_tree *it;
	void *data;
	unsigned long size;
	unsigned char tree_sha1[20];
938

939 940 941
	if (window <= num_preferred_base++)
		return;

942 943
	data = read_object_with_reference(sha1, tree_type, &size, tree_sha1);
	if (!data)
944
		return;
945 946

	for (it = pbase_tree; it; it = it->next) {
947
		if (!hashcmp(it->pcache.sha1, tree_sha1)) {
948 949 950 951 952 953 954 955 956
			free(data);
			return;
		}
	}

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

957
	hashcpy(it->pcache.sha1, tree_sha1);
958 959
	it->pcache.tree_data = data;
	it->pcache.tree_size = size;
960 961
}

962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988
static void cleanup_preferred_base(void)
{
	struct pbase_tree *it;
	unsigned i;

	it = pbase_tree;
	pbase_tree = NULL;
	while (it) {
		struct pbase_tree *this = it;
		it = this->next;
		free(this->pcache.tree_data);
		free(this);
	}

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

	free(done_pbase_paths);
	done_pbase_paths = NULL;
	done_pbase_paths_num = done_pbase_paths_alloc = 0;
}

989 990
static void check_object(struct object_entry *entry)
{
991
	if (entry->in_pack) {
992
		struct packed_git *p = entry->in_pack;
993
		struct pack_window *w_curs = NULL;
994 995 996
		const unsigned char *base_ref = NULL;
		struct object_entry *base_entry;
		unsigned long used, used_0;
997
		unsigned int avail;
998 999
		off_t ofs;
		unsigned char *buf, c;
1000

1001
		buf = use_pack(p, &w_curs, entry->in_pack_offset, &avail);
1002

1003
		/*
1004 1005
		 * We want in_pack_type even if we do not reuse delta
		 * since non-delta representations could still be reused.
1006
		 */
1007
		used = unpack_object_header_buffer(buf, avail,
1008 1009
						   &entry->in_pack_type,
						   &entry->size);
1010 1011
		if (used == 0)
			goto give_up;
1012

1013 1014 1015 1016
		/*
		 * 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.
1017
		 */
1018 1019 1020 1021 1022
		switch (entry->in_pack_type) {
		default:
			/* Not a delta hence we've already got all we need. */
			entry->type = entry->in_pack_type;
			entry->in_pack_header_size = used;
1023 1024
			if (entry->type < OBJ_COMMIT || entry->type > OBJ_BLOB)
				goto give_up;
1025 1026 1027
			unuse_pack(&w_curs);
			return;
		case OBJ_REF_DELTA:
1028
			if (reuse_delta && !entry->preferred_base)
1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040
				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;
1041 1042 1043 1044 1045
				if (!ofs || MSB(ofs, 7)) {
					error("delta base offset overflow in pack for %s",
					      sha1_to_hex(entry->idx.sha1));
					goto give_up;
				}
1046 1047
				c = buf[used_0++];
				ofs = (ofs << 7) + (c & 127);
1048
			}
1049
			ofs = entry->in_pack_offset - ofs;
1050 1051 1052 1053 1054
			if (ofs <= 0 || ofs >= entry->in_pack_offset) {
				error("delta base offset out of bound for %s",
				      sha1_to_hex(entry->idx.sha1));
				goto give_up;
			}
1055
			if (reuse_delta && !entry->preferred_base) {
1056 1057
				struct revindex_entry *revidx;
				revidx = find_pack_revindex(p, ofs);
1058 1059
				if (!revidx)
					goto give_up;
1060 1061
				base_ref = nth_packed_object_sha1(p, revidx->nr);
			}
1062 1063
			entry->in_pack_header_size = used + used_0;
			break;
1064 1065
		}

1066 1067 1068 1069 1070 1071 1072 1073 1074 1075
		if (base_ref && (base_entry = locate_object_entry(base_ref))) {
			/*
			 * 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.
1076
			 */
1077
			entry->type = entry->in_pack_type;
1078
			entry->delta = base_entry;
1079
			entry->delta_size = entry->size;
1080 1081
			entry->delta_sibling = base_entry->delta_child;
			base_entry->delta_child = entry;
1082 1083 1084
			unuse_pack(&w_curs);
			return;
		}
1085

1086 1087 1088 1089 1090 1091 1092 1093
		if (entry->type) {
			/*
			 * This must be a delta and we already know what the
			 * final object type is.  Let's extract the actual
			 * object size from the delta header.
			 */
			entry->size = get_size_from_delta(p, &w_curs,
					entry->in_pack_offset + entry->in_pack_header_size);
1094 1095
			if (entry->size == 0)
				goto give_up;
1096
			unuse_pack(&w_curs);
1097 1098
			return;
		}
1099 1100 1101 1102 1103 1104

		/*
		 * No choice but to fall back to the recursive delta walk
		 * with sha1_object_info() to find about the object type
		 * at this point...
		 */
1105
		give_up:
1106
		unuse_pack(&w_curs);
1107
	}
1108

G
Geert Bosch 已提交
1109
	entry->type = sha1_object_info(entry->idx.sha1, &entry->size);
1110 1111 1112 1113 1114 1115
	/*
	 * 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.
	 */
1116 1117
}

1118 1119 1120 1121 1122 1123 1124
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)
G
Geert Bosch 已提交
1125
		return hashcmp(a->idx.sha1, b->idx.sha1);
1126 1127 1128 1129 1130 1131 1132 1133 1134

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

1135 1136
static void get_object_details(void)
{
1137
	uint32_t i;
1138 1139 1140 1141 1142 1143
	struct object_entry **sorted_by_offset;

	sorted_by_offset = xcalloc(nr_objects, sizeof(struct object_entry *));
	for (i = 0; i < nr_objects; i++)
		sorted_by_offset[i] = objects + i;
	qsort(sorted_by_offset, nr_objects, sizeof(*sorted_by_offset), pack_offset_sort);
1144

1145 1146
	for (i = 0; i < nr_objects; i++)
		check_object(sorted_by_offset[i]);
1147

1148
	free(sorted_by_offset);
1149 1150
}

1151 1152 1153 1154 1155 1156 1157 1158 1159
/*
 * 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.
 */
1160
static int type_size_sort(const void *_a, const void *_b)
1161
{
1162 1163 1164
	const struct object_entry *a = *(struct object_entry **)_a;
	const struct object_entry *b = *(struct object_entry **)_b;

1165
	if (a->type > b->type)
1166
		return -1;
1167
	if (a->type < b->type)
1168
		return 1;
1169
	if (a->hash > b->hash)
1170
		return -1;
1171
	if (a->hash < b->hash)
1172
		return 1;
1173
	if (a->preferred_base > b->preferred_base)
1174
		return -1;
1175 1176
	if (a->preferred_base < b->preferred_base)
		return 1;
1177
	if (a->size > b->size)
1178 1179
		return -1;
	if (a->size < b->size)
1180
		return 1;
1181
	return a < b ? -1 : (a > b);  /* newest first */
1182 1183 1184 1185 1186
}

struct unpacked {
	struct object_entry *entry;
	void *data;
1187
	struct delta_index *index;
1188
	unsigned depth;
1189 1190
};

1191 1192
static int delta_cacheable(unsigned long src_size, unsigned long trg_size,
			   unsigned long delta_size)
1193 1194 1195 1196
{
	if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size)
		return 0;

1197 1198 1199
	if (delta_size < cache_max_small_delta_size)
		return 1;

1200 1201 1202 1203 1204 1205 1206
	/* 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;
}

1207
#ifndef NO_PTHREADS
N
Nicolas Pitre 已提交
1208

1209
static pthread_mutex_t read_mutex;
N
Nicolas Pitre 已提交
1210 1211 1212
#define read_lock()		pthread_mutex_lock(&read_mutex)
#define read_unlock()		pthread_mutex_unlock(&read_mutex)

1213
static pthread_mutex_t cache_mutex;
1214 1215 1216
#define cache_lock()		pthread_mutex_lock(&cache_mutex)
#define cache_unlock()		pthread_mutex_unlock(&cache_mutex)

1217
static pthread_mutex_t progress_mutex;
N
Nicolas Pitre 已提交
1218 1219 1220 1221 1222
#define progress_lock()		pthread_mutex_lock(&progress_mutex)
#define progress_unlock()	pthread_mutex_unlock(&progress_mutex)

#else

1223 1224 1225 1226 1227 1228
#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 已提交
1229 1230 1231

#endif

1232
static int try_delta(struct unpacked *trg, struct unpacked *src,
1233
		     unsigned max_depth, unsigned long *mem_usage)
1234
{
1235 1236
	struct object_entry *trg_entry = trg->entry;
	struct object_entry *src_entry = src->entry;
1237
	unsigned long trg_size, src_size, delta_size, sizediff, max_size, sz;
1238
	unsigned ref_depth;
1239
	enum object_type type;
1240 1241 1242
	void *delta_buf;

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

1246 1247
	/*
	 * We do not bother to try a delta that we discarded
1248
	 * on an earlier try, but only when reusing delta data.
1249
	 */
1250
	if (reuse_delta && trg_entry->in_pack &&
1251 1252 1253
	    trg_entry->in_pack == src_entry->in_pack &&
	    trg_entry->in_pack_type != OBJ_REF_DELTA &&
	    trg_entry->in_pack_type != OBJ_OFS_DELTA)
1254 1255
		return 0;

1256
	/* Let's not bust the allowed depth. */
1257
	if (src->depth >= max_depth)
1258
		return 0;
1259

1260
	/* Now some size filtering heuristics. */
1261
	trg_size = trg_entry->size;
1262 1263 1264 1265 1266
	if (!trg_entry->delta) {
		max_size = trg_size/2 - 20;
		ref_depth = 1;
	} else {
		max_size = trg_entry->delta_size;
1267
		ref_depth = trg->depth;
1268
	}
1269
	max_size = (uint64_t)max_size * (max_depth - src->depth) /
1270
						(max_depth - ref_depth + 1);
1271 1272
	if (max_size == 0)
		return 0;
1273
	src_size = src_entry->size;
1274
	sizediff = src_size < trg_size ? trg_size - src_size : 0;
1275
	if (sizediff >= max_size)
1276
		return 0;
1277 1278
	if (trg_size < src_size / 32)
		return 0;
1279

1280 1281
	/* Load data if not already done */
	if (!trg->data) {
N
Nicolas Pitre 已提交
1282
		read_lock();
G
Geert Bosch 已提交
1283
		trg->data = read_sha1_file(trg_entry->idx.sha1, &type, &sz);
N
Nicolas Pitre 已提交
1284
		read_unlock();
1285 1286 1287
		if (!trg->data)
			die("object %s cannot be read",
			    sha1_to_hex(trg_entry->idx.sha1));
1288 1289
		if (sz != trg_size)
			die("object %s inconsistent object length (%lu vs %lu)",
G
Geert Bosch 已提交
1290
			    sha1_to_hex(trg_entry->idx.sha1), sz, trg_size);
1291
		*mem_usage += sz;
1292 1293
	}
	if (!src->data) {
N
Nicolas Pitre 已提交
1294
		read_lock();
G
Geert Bosch 已提交
1295
		src->data = read_sha1_file(src_entry->idx.sha1, &type, &sz);
N
Nicolas Pitre 已提交
1296
		read_unlock();
1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310
		if (!src->data) {
			if (src_entry->preferred_base) {
				static int warned = 0;
				if (!warned++)
					warning("object %s cannot be read",
						sha1_to_hex(src_entry->idx.sha1));
				/*
				 * 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;
			}
1311 1312
			die("object %s cannot be read",
			    sha1_to_hex(src_entry->idx.sha1));
1313
		}
1314 1315
		if (sz != src_size)
			die("object %s inconsistent object length (%lu vs %lu)",
G
Geert Bosch 已提交
1316
			    sha1_to_hex(src_entry->idx.sha1), sz, src_size);
1317
		*mem_usage += sz;
1318 1319 1320
	}
	if (!src->index) {
		src->index = create_delta_index(src->data, src_size);
1321 1322 1323 1324 1325 1326
		if (!src->index) {
			static int warned = 0;
			if (!warned++)
				warning("suboptimal pack - out of memory");
			return 0;
		}
1327
		*mem_usage += sizeof_delta_index(src->index);
1328 1329 1330
	}

	delta_buf = create_delta(src->index, trg->data, trg_size, &delta_size, max_size);
1331
	if (!delta_buf)
1332
		return 0;
1333

N
Nicolas Pitre 已提交
1334
	if (trg_entry->delta) {
1335 1336
		/* Prefer only shallower same-sized deltas. */
		if (delta_size == trg_entry->delta_size &&
1337
		    src->depth + 1 >= trg->depth) {
1338 1339 1340
			free(delta_buf);
			return 0;
		}
1341
	}
N
Nicolas Pitre 已提交
1342

1343 1344 1345
	/*
	 * Handle memory allocation outside of the cache
	 * accounting lock.  Compiler will optimize the strangeness
1346
	 * away when NO_PTHREADS is defined.
1347
	 */
1348
	free(trg_entry->delta_data);
1349
	cache_lock();
N
Nicolas Pitre 已提交
1350 1351 1352 1353
	if (trg_entry->delta_data) {
		delta_cache_size -= trg_entry->delta_size;
		trg_entry->delta_data = NULL;
	}
1354
	if (delta_cacheable(src_size, trg_size, delta_size)) {
1355
		delta_cache_size += delta_size;
1356 1357 1358 1359
		cache_unlock();
		trg_entry->delta_data = xrealloc(delta_buf, delta_size);
	} else {
		cache_unlock();
1360
		free(delta_buf);
1361 1362
	}

1363 1364 1365 1366
	trg_entry->delta = src_entry;
	trg_entry->delta_size = delta_size;
	trg->depth = src->depth + 1;

1367
	return 1;
1368 1369
}

1370
static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
1371
{
1372 1373 1374 1375 1376 1377 1378 1379 1380
	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;
1381 1382
}

1383
static unsigned long free_unpacked(struct unpacked *n)
1384
{
1385
	unsigned long freed_mem = sizeof_delta_index(n->index);
1386 1387 1388
	free_delta_index(n->index);
	n->index = NULL;
	if (n->data) {
1389
		freed_mem += n->entry->size;
1390 1391 1392 1393
		free(n->data);
		n->data = NULL;
	}
	n->entry = NULL;
1394
	n->depth = 0;
1395
	return freed_mem;
1396 1397
}

1398
static void find_deltas(struct object_entry **list, unsigned *list_size,
1399
			int window, int depth, unsigned *processed)
1400
{
1401
	uint32_t i, idx = 0, count = 0;
1402
	struct unpacked *array;
1403
	unsigned long mem_usage = 0;
1404

1405
	array = xcalloc(window, sizeof(struct unpacked));
1406

1407
	for (;;) {
1408
		struct object_entry *entry;
1409
		struct unpacked *n = array + idx;
1410
		int j, max_depth, best_base = -1;
1411

1412 1413 1414 1415 1416
		progress_lock();
		if (!*list_size) {
			progress_unlock();
			break;
		}
1417
		entry = *list++;
1418 1419 1420 1421 1422 1423 1424
		(*list_size)--;
		if (!entry->preferred_base) {
			(*processed)++;
			display_progress(progress_state, *processed);
		}
		progress_unlock();

1425
		mem_usage -= free_unpacked(n);
1426
		n->entry = entry;
1427

1428
		while (window_memory_limit &&
1429
		       mem_usage > window_memory_limit &&
1430 1431
		       count > 1) {
			uint32_t tail = (idx + window - count) % window;
1432
			mem_usage -= free_unpacked(array + tail);
1433 1434 1435
			count--;
		}

1436 1437 1438 1439 1440 1441
		/* We do not compute delta to *create* objects we are not
		 * going to pack.
		 */
		if (entry->preferred_base)
			goto next;

1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453
		/*
		 * 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 已提交
1454 1455
		j = window;
		while (--j > 0) {
1456
			int ret;
1457
			uint32_t other_idx = idx + j;
1458
			struct unpacked *m;
L
Linus Torvalds 已提交
1459 1460
			if (other_idx >= window)
				other_idx -= window;
1461 1462 1463
			m = array + other_idx;
			if (!m->entry)
				break;
1464
			ret = try_delta(n, m, max_depth, &mem_usage);
1465
			if (ret < 0)
1466
				break;
1467 1468
			else if (ret > 0)
				best_base = other_idx;
1469
		}
1470

1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493
		/*
		 * 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();
		}

1494 1495 1496 1497
		/* 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.
		 */
1498
		if (entry->delta && max_depth <= n->depth)
1499
			continue;
1500

1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517
		/*
		 * 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;
		}

1518
		next:
1519
		idx++;
1520 1521
		if (count + 1 < window)
			count++;
1522 1523
		if (idx >= window)
			idx = 0;
1524
	}
1525

1526
	for (i = 0; i < window; ++i) {
1527
		free_delta_index(array[i].index);
1528
		free(array[i].data);
1529
	}
1530
	free(array);
1531 1532
}

1533
#ifndef NO_PTHREADS
N
Nicolas Pitre 已提交
1534

1535 1536 1537 1538 1539 1540 1541
static void try_to_free_from_threads(size_t size)
{
	read_lock();
	release_pack_memory(size, -1);
	read_unlock();
}

1542
static try_to_free_t old_try_to_free_routine;
1543

1544 1545 1546 1547 1548 1549 1550 1551 1552
/*
 * 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 已提交
1553 1554 1555 1556
struct thread_params {
	pthread_t thread;
	struct object_entry **list;
	unsigned list_size;
1557
	unsigned remaining;
N
Nicolas Pitre 已提交
1558 1559
	int window;
	int depth;
1560 1561 1562 1563
	int working;
	int data_ready;
	pthread_mutex_t mutex;
	pthread_cond_t cond;
N
Nicolas Pitre 已提交
1564 1565 1566
	unsigned *processed;
};

1567 1568 1569 1570 1571 1572 1573
static pthread_cond_t progress_cond;

/*
 * Mutex and conditional variable can't be statically-initialized on Windows.
 */
static void init_threaded_search(void)
{
1574
	init_recursive_mutex(&read_mutex);
1575 1576 1577
	pthread_mutex_init(&cache_mutex, NULL);
	pthread_mutex_init(&progress_mutex, NULL);
	pthread_cond_init(&progress_cond, NULL);
1578
	old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
1579 1580 1581 1582
}

static void cleanup_threaded_search(void)
{
1583
	set_try_to_free_routine(old_try_to_free_routine);
1584 1585 1586 1587 1588
	pthread_cond_destroy(&progress_cond);
	pthread_mutex_destroy(&read_mutex);
	pthread_mutex_destroy(&cache_mutex);
	pthread_mutex_destroy(&progress_mutex);
}
1589

N
Nicolas Pitre 已提交
1590 1591
static void *threaded_find_deltas(void *arg)
{
1592 1593
	struct thread_params *me = arg;

1594
	while (me->remaining) {
1595
		find_deltas(me->list, &me->remaining,
1596
			    me->window, me->depth, me->processed);
1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615

		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);
1616
	}
1617 1618
	/* leave ->working 1 so that this doesn't get more work assigned */
	return NULL;
N
Nicolas Pitre 已提交
1619 1620 1621 1622 1623
}

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

1627 1628
	init_threaded_search();

1629 1630
	if (!delta_search_threads)	/* --threads=0 means autodetect */
		delta_search_threads = online_cpus();
1631
	if (delta_search_threads <= 1) {
1632
		find_deltas(list, &list_size, window, depth, processed);
1633
		cleanup_threaded_search();
1634 1635
		return;
	}
1636
	if (progress > pack_to_stdout)
1637
		fprintf(stderr, "Delta compression using up to %d threads.\n",
1638
				delta_search_threads);
1639
	p = xcalloc(delta_search_threads, sizeof(*p));
1640

1641
	/* Partition the work amongst work threads. */
1642
	for (i = 0; i < delta_search_threads; i++) {
1643 1644
		unsigned sub_size = list_size / (delta_search_threads - i);

1645 1646 1647 1648
		/* 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 已提交
1649 1650 1651
		p[i].window = window;
		p[i].depth = depth;
		p[i].processed = processed;
1652 1653
		p[i].working = 1;
		p[i].data_ready = 0;
1654

1655
		/* try to split chunks on "path" boundaries */
1656 1657
		while (sub_size && sub_size < list_size &&
		       list[sub_size]->hash &&
1658 1659 1660
		       list[sub_size]->hash == list[sub_size-1]->hash)
			sub_size++;

1661 1662 1663
		p[i].list = list;
		p[i].list_size = sub_size;
		p[i].remaining = sub_size;
1664

1665 1666 1667 1668
		list += sub_size;
		list_size -= sub_size;
	}

1669 1670 1671 1672
	/* Start work threads. */
	for (i = 0; i < delta_search_threads; i++) {
		if (!p[i].list_size)
			continue;
1673 1674
		pthread_mutex_init(&p[i].mutex, NULL);
		pthread_cond_init(&p[i].cond, NULL);
1675 1676 1677 1678 1679 1680 1681
		ret = pthread_create(&p[i].thread, NULL,
				     threaded_find_deltas, &p[i]);
		if (ret)
			die("unable to create thread: %s", strerror(ret));
		active_threads++;
	}

1682 1683 1684 1685 1686 1687 1688 1689
	/*
	 * 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.
	 */
1690 1691
	while (active_threads) {
		struct thread_params *target = NULL;
1692 1693 1694 1695
		struct thread_params *victim = NULL;
		unsigned sub_size = 0;

		progress_lock();
1696 1697 1698 1699 1700 1701 1702 1703 1704
		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);
		}

1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716
		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--;
			}
1717 1718 1719 1720 1721 1722 1723 1724 1725 1726
			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;
			}
1727 1728 1729 1730 1731 1732
			target->list = list;
			victim->list_size -= sub_size;
			victim->remaining -= sub_size;
		}
		target->list_size = sub_size;
		target->remaining = sub_size;
1733 1734 1735 1736 1737 1738 1739
		target->working = 1;
		progress_unlock();

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

1741
		if (!sub_size) {
1742
			pthread_join(target->thread, NULL);
1743 1744
			pthread_cond_destroy(&target->cond);
			pthread_mutex_destroy(&target->mutex);
1745
			active_threads--;
1746
		}
1747
	}
1748
	cleanup_threaded_search();
1749
	free(p);
N
Nicolas Pitre 已提交
1750 1751 1752
}

#else
1753
#define ll_find_deltas(l, s, w, d, p)	find_deltas(l, &s, w, d, p)
N
Nicolas Pitre 已提交
1754 1755
#endif

1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767
static int add_ref_tag(const char *path, const unsigned char *sha1, int flag, void *cb_data)
{
	unsigned char peeled[20];

	if (!prefixcmp(path, "refs/tags/") && /* is a tag? */
	    !peel_ref(path, peeled)        && /* peelable? */
	    !is_null_sha1(peeled)          && /* annotated tag? */
	    locate_object_entry(peeled))      /* object packed? */
		add_object_entry(sha1, OBJ_TAG, NULL, 0);
	return 0;
}

1768 1769
static void prepare_pack(int window, int depth)
{
1770
	struct object_entry **delta_list;
1771 1772
	uint32_t i, nr_deltas;
	unsigned n;
1773

1774
	get_object_details();
1775

1776 1777 1778 1779 1780 1781 1782 1783 1784 1785
	/*
	 * 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;

1786
	if (!nr_objects || !window || !depth)
1787 1788 1789
		return;

	delta_list = xmalloc(nr_objects * sizeof(*delta_list));
1790 1791 1792 1793 1794 1795 1796
	nr_deltas = n = 0;

	for (i = 0; i < nr_objects; i++) {
		struct object_entry *entry = objects + i;

		if (entry->delta)
			/* This happens if we decided to reuse existing
1797
			 * delta from a pack.  "reuse_delta &&" is implied.
1798 1799 1800 1801 1802 1803 1804 1805 1806
			 */
			continue;

		if (entry->size < 50)
			continue;

		if (entry->no_try_delta)
			continue;

1807
		if (!entry->preferred_base) {
1808
			nr_deltas++;
1809 1810 1811
			if (entry->type < 0)
				die("unable to get type of object %s",
				    sha1_to_hex(entry->idx.sha1));
1812 1813 1814 1815 1816 1817 1818 1819
		} else {
			if (entry->type < 0) {
				/*
				 * This object is not found, but we
				 * don't have to include it anyway.
				 */
				continue;
			}
1820
		}
1821 1822 1823 1824

		delta_list[n++] = entry;
	}

1825
	if (nr_deltas && n > 1) {
1826 1827
		unsigned nr_done = 0;
		if (progress)
1828 1829
			progress_state = start_progress("Compressing objects",
							nr_deltas);
1830
		qsort(delta_list, n, sizeof(*delta_list), type_size_sort);
N
Nicolas Pitre 已提交
1831
		ll_find_deltas(delta_list, n, window+1, depth, &nr_done);
N
Nicolas Pitre 已提交
1832
		stop_progress(&progress_state);
1833 1834
		if (nr_done != nr_deltas)
			die("inconsistency with delta count");
1835
	}
1836
	free(delta_list);
1837 1838
}

1839
static int git_pack_config(const char *k, const char *v, void *cb)
1840
{
1841
	if (!strcmp(k, "pack.window")) {
1842 1843 1844
		window = git_config_int(k, v);
		return 0;
	}
1845 1846 1847 1848 1849
	if (!strcmp(k, "pack.windowmemory")) {
		window_memory_limit = git_config_ulong(k, v);
		return 0;
	}
	if (!strcmp(k, "pack.depth")) {
1850 1851 1852
		depth = git_config_int(k, v);
		return 0;
	}
1853 1854 1855 1856 1857 1858 1859 1860 1861 1862
	if (!strcmp(k, "pack.compression")) {
		int level = git_config_int(k, v);
		if (level == -1)
			level = Z_DEFAULT_COMPRESSION;
		else if (level < 0 || level > Z_BEST_COMPRESSION)
			die("bad pack compression level %d", level);
		pack_compression_level = level;
		pack_compression_seen = 1;
		return 0;
	}
1863 1864 1865 1866
	if (!strcmp(k, "pack.deltacachesize")) {
		max_delta_cache_size = git_config_int(k, v);
		return 0;
	}
1867 1868 1869 1870
	if (!strcmp(k, "pack.deltacachelimit")) {
		cache_max_small_delta_size = git_config_int(k, v);
		return 0;
	}
1871 1872
	if (!strcmp(k, "pack.threads")) {
		delta_search_threads = git_config_int(k, v);
1873
		if (delta_search_threads < 0)
1874 1875
			die("invalid number of threads specified (%d)",
			    delta_search_threads);
1876
#ifdef NO_PTHREADS
1877
		if (delta_search_threads != 1)
1878 1879 1880 1881
			warning("no threads support, ignoring %s", k);
#endif
		return 0;
	}
1882 1883 1884
	if (!strcmp(k, "pack.indexversion")) {
		pack_idx_default_version = git_config_int(k, v);
		if (pack_idx_default_version > 2)
1885 1886
			die("bad pack.indexversion=%"PRIu32,
				pack_idx_default_version);
1887 1888
		return 0;
	}
1889 1890 1891 1892
	if (!strcmp(k, "pack.packsizelimit")) {
		pack_size_limit_cfg = git_config_ulong(k, v);
		return 0;
	}
1893
	return git_default_config(k, v, cb);
1894 1895
}

1896
static void read_object_list_from_stdin(void)
1897
{
1898 1899
	char line[40 + 1 + PATH_MAX + 2];
	unsigned char sha1[20];
1900

1901 1902 1903 1904 1905 1906
	for (;;) {
		if (!fgets(line, sizeof(line), stdin)) {
			if (feof(stdin))
				break;
			if (!ferror(stdin))
				die("fgets returned NULL, not EOF, not error!");
1907
			if (errno != EINTR)
1908
				die_errno("fgets");
1909 1910
			clearerr(stdin);
			continue;
1911
		}
1912 1913 1914
		if (line[0] == '-') {
			if (get_sha1_hex(line+1, sha1))
				die("expected edge sha1, got garbage:\n %s",
1915
				    line);
1916
			add_preferred_base(sha1);
1917
			continue;
1918
		}
1919
		if (get_sha1_hex(line, sha1))
1920
			die("expected sha1, got garbage:\n %s", line);
1921

1922 1923
		add_preferred_base_object(line+41);
		add_object_entry(sha1, 0, line+41, 0);
1924
	}
1925 1926
}

J
Junio C Hamano 已提交
1927 1928
#define OBJECT_ADDED (1u<<20)

1929
static void show_commit(struct commit *commit, void *data)
1930
{
1931
	add_object_entry(commit->object.sha1, OBJ_COMMIT, NULL, 0);
J
Junio C Hamano 已提交
1932
	commit->object.flags |= OBJECT_ADDED;
1933 1934
}

1935
static void show_object(struct object *obj, const struct name_path *path, const char *last)
1936
{
1937 1938
	char *name = path_name(path, last);

1939 1940 1941 1942 1943 1944 1945 1946 1947
	add_preferred_base_object(name);
	add_object_entry(obj->sha1, obj->type, name, 0);
	obj->flags |= OBJECT_ADDED;

	/*
	 * We will have generated the hash from the name,
	 * but not saved a pointer to it - we can free it
	 */
	free((char *)name);
1948 1949
}

1950 1951 1952 1953 1954
static void show_edge(struct commit *commit)
{
	add_preferred_base(commit->object.sha1);
}

J
Junio C Hamano 已提交
1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974
struct in_pack_object {
	off_t offset;
	struct object *object;
};

struct in_pack {
	int alloc;
	int nr;
	struct in_pack_object *array;
};

static void mark_in_pack_object(struct object *object, struct packed_git *p, struct in_pack *in_pack)
{
	in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->sha1, p);
	in_pack->array[in_pack->nr].object = object;
	in_pack->nr++;
}

/*
 * Compare the objects in the offset order, in order to emulate the
1975
 * "git rev-list --objects" output that produced the pack originally.
J
Junio C Hamano 已提交
1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001
 */
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
		return hashcmp(a->object->sha1, b->object->sha1);
}

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

	for (p = packed_git; p; p = p->next) {
		const unsigned char *sha1;
		struct object *o;

2002
		if (!p->pack_local || p->pack_keep)
J
Junio C Hamano 已提交
2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030
			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++) {
			sha1 = nth_packed_object_sha1(p, i);
			o = lookup_unknown_object(sha1);
			if (!(o->flags & OBJECT_ADDED))
				mark_in_pack_object(o, p, &in_pack);
			o->flags |= OBJECT_ADDED;
		}
	}

	if (in_pack.nr) {
		qsort(in_pack.array, in_pack.nr, sizeof(in_pack.array[0]),
		      ofscmp);
		for (i = 0; i < in_pack.nr; i++) {
			struct object *o = in_pack.array[i].object;
			add_object_entry(o->sha1, o->type, "", 0);
		}
	}
	free(in_pack.array);
}

2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053
static int has_sha1_pack_kept_or_nonlocal(const unsigned char *sha1)
{
	static struct packed_git *last_found = (void *)1;
	struct packed_git *p;

	p = (last_found != (void *)1) ? last_found : packed_git;

	while (p) {
		if ((!p->pack_local || p->pack_keep) &&
			find_pack_entry_one(sha1, p)) {
			last_found = p;
			return 1;
		}
		if (p == last_found)
			p = packed_git;
		else
			p = p->next;
		if (p == last_found)
			p = p->next;
	}
	return 0;
}

2054 2055 2056 2057 2058 2059 2060
static void loosen_unused_packed_objects(struct rev_info *revs)
{
	struct packed_git *p;
	uint32_t i;
	const unsigned char *sha1;

	for (p = packed_git; p; p = p->next) {
2061
		if (!p->pack_local || p->pack_keep)
2062 2063 2064 2065 2066 2067 2068
			continue;

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

		for (i = 0; i < p->num_objects; i++) {
			sha1 = nth_packed_object_sha1(p, i);
2069 2070
			if (!locate_object_entry(sha1) &&
				!has_sha1_pack_kept_or_nonlocal(sha1))
2071 2072 2073 2074 2075 2076
				if (force_object_loose(sha1, p->mtime))
					die("unable to force loose object");
		}
	}
}

2077
static void get_object_list(int ac, const char **av)
2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088
{
	struct rev_info revs;
	char line[1000];
	int flags = 0;

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

	while (fgets(line, sizeof(line), stdin) != NULL) {
		int len = strlen(line);
2089
		if (len && line[len - 1] == '\n')
2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103
			line[--len] = 0;
		if (!len)
			break;
		if (*line == '-') {
			if (!strcmp(line, "--not")) {
				flags ^= UNINTERESTING;
				continue;
			}
			die("not a rev '%s'", line);
		}
		if (handle_revision_arg(line, &revs, flags, 1))
			die("bad revision '%s'", line);
	}

2104 2105
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
2106
	mark_edges_uninteresting(revs.commits, &revs, show_edge);
2107
	traverse_commit_list(&revs, show_commit, show_object, NULL);
J
Junio C Hamano 已提交
2108 2109 2110

	if (keep_unreachable)
		add_objects_in_unpacked_packs(&revs);
2111 2112
	if (unpack_unreachable)
		loosen_unused_packed_objects(&revs);
2113 2114 2115 2116 2117
}

int cmd_pack_objects(int argc, const char **argv, const char *prefix)
{
	int use_internal_rev_list = 0;
2118
	int thin = 0;
2119
	int all_progress_implied = 0;
2120
	uint32_t i;
2121 2122
	const char **rp_av;
	int rp_ac_alloc = 64;
2123 2124
	int rp_ac;

2125 2126
	read_replace_refs = 0;

2127 2128
	rp_av = xcalloc(rp_ac_alloc, sizeof(*rp_av));

2129 2130 2131
	rp_av[0] = "pack-objects";
	rp_av[1] = "--objects"; /* --thin will make it --objects-edge */
	rp_ac = 2;
2132

2133
	git_config(git_pack_config, NULL);
2134 2135
	if (!pack_compression_seen && core_compression_seen)
		pack_compression_level = core_compression_level;
2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155

	progress = isatty(2);
	for (i = 1; i < argc; i++) {
		const char *arg = argv[i];

		if (*arg != '-')
			break;

		if (!strcmp("--non-empty", arg)) {
			non_empty = 1;
			continue;
		}
		if (!strcmp("--local", arg)) {
			local = 1;
			continue;
		}
		if (!strcmp("--incremental", arg)) {
			incremental = 1;
			continue;
		}
2156 2157 2158 2159
		if (!strcmp("--honor-pack-keep", arg)) {
			ignore_packed_keep = 1;
			continue;
		}
2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171
		if (!prefixcmp(arg, "--compression=")) {
			char *end;
			int level = strtoul(arg+14, &end, 0);
			if (!arg[14] || *end)
				usage(pack_usage);
			if (level == -1)
				level = Z_DEFAULT_COMPRESSION;
			else if (level < 0 || level > Z_BEST_COMPRESSION)
				die("bad pack compression level %d", level);
			pack_compression_level = level;
			continue;
		}
2172
		if (!prefixcmp(arg, "--max-pack-size=")) {
2173
			pack_size_limit_cfg = 0;
2174
			if (!git_parse_ulong(arg+16, &pack_size_limit))
2175 2176 2177
				usage(pack_usage);
			continue;
		}
2178
		if (!prefixcmp(arg, "--window=")) {
2179 2180 2181 2182 2183 2184
			char *end;
			window = strtoul(arg+9, &end, 0);
			if (!arg[9] || *end)
				usage(pack_usage);
			continue;
		}
2185 2186 2187 2188 2189
		if (!prefixcmp(arg, "--window-memory=")) {
			if (!git_parse_ulong(arg+16, &window_memory_limit))
				usage(pack_usage);
			continue;
		}
2190 2191 2192
		if (!prefixcmp(arg, "--threads=")) {
			char *end;
			delta_search_threads = strtoul(arg+10, &end, 0);
2193
			if (!arg[10] || *end || delta_search_threads < 0)
2194
				usage(pack_usage);
2195
#ifdef NO_PTHREADS
2196
			if (delta_search_threads != 1)
2197 2198 2199 2200 2201
				warning("no threads support, "
					"ignoring %s", arg);
#endif
			continue;
		}
2202
		if (!prefixcmp(arg, "--depth=")) {
2203 2204 2205 2206 2207 2208 2209 2210 2211 2212
			char *end;
			depth = strtoul(arg+8, &end, 0);
			if (!arg[8] || *end)
				usage(pack_usage);
			continue;
		}
		if (!strcmp("--progress", arg)) {
			progress = 1;
			continue;
		}
2213 2214 2215 2216
		if (!strcmp("--all-progress", arg)) {
			progress = 2;
			continue;
		}
2217 2218 2219 2220
		if (!strcmp("--all-progress-implied", arg)) {
			all_progress_implied = 1;
			continue;
		}
2221 2222 2223 2224 2225
		if (!strcmp("-q", arg)) {
			progress = 0;
			continue;
		}
		if (!strcmp("--no-reuse-delta", arg)) {
2226
			reuse_delta = 0;
2227 2228
			continue;
		}
2229
		if (!strcmp("--no-reuse-object", arg)) {
2230
			reuse_object = reuse_delta = 0;
2231 2232
			continue;
		}
2233
		if (!strcmp("--delta-base-offset", arg)) {
2234
			allow_ofs_delta = 1;
2235 2236
			continue;
		}
2237 2238 2239 2240 2241 2242 2243 2244
		if (!strcmp("--stdout", arg)) {
			pack_to_stdout = 1;
			continue;
		}
		if (!strcmp("--revs", arg)) {
			use_internal_rev_list = 1;
			continue;
		}
J
Junio C Hamano 已提交
2245 2246 2247 2248
		if (!strcmp("--keep-unreachable", arg)) {
			keep_unreachable = 1;
			continue;
		}
2249 2250 2251 2252
		if (!strcmp("--unpack-unreachable", arg)) {
			unpack_unreachable = 1;
			continue;
		}
2253 2254 2255 2256
		if (!strcmp("--include-tag", arg)) {
			include_tag = 1;
			continue;
		}
2257
		if (!strcmp("--unpacked", arg) ||
2258
		    !strcmp("--reflog", arg) ||
2259 2260
		    !strcmp("--all", arg)) {
			use_internal_rev_list = 1;
2261 2262 2263 2264 2265
			if (rp_ac >= rp_ac_alloc - 1) {
				rp_ac_alloc = alloc_nr(rp_ac_alloc);
				rp_av = xrealloc(rp_av,
						 rp_ac_alloc * sizeof(*rp_av));
			}
2266
			rp_av[rp_ac++] = arg;
2267 2268
			continue;
		}
2269 2270 2271 2272
		if (!strcmp("--thin", arg)) {
			use_internal_rev_list = 1;
			thin = 1;
			rp_av[1] = "--objects-edge";
2273
			continue;
2274 2275 2276
		}
		if (!prefixcmp(arg, "--index-version=")) {
			char *c;
G
Geert Bosch 已提交
2277 2278
			pack_idx_default_version = strtoul(arg + 16, &c, 10);
			if (pack_idx_default_version > 2)
2279 2280
				die("bad %s", arg);
			if (*c == ',')
G
Geert Bosch 已提交
2281 2282
				pack_idx_off32_limit = strtoul(c+1, &c, 0);
			if (*c || pack_idx_off32_limit & 0x80000000)
2283 2284
				die("bad %s", arg);
			continue;
2285
		}
2286 2287 2288 2289
		if (!strcmp(arg, "--keep-true-parents")) {
			grafts_replace_parents = 0;
			continue;
		}
2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311
		usage(pack_usage);
	}

	/* Traditionally "pack-objects [options] base extra" failed;
	 * we would however want to take refs parameter that would
	 * have been given to upstream rev-list ourselves, which means
	 * we somehow want to say what the base name is.  So the
	 * syntax would be:
	 *
	 * pack-objects [options] base <refs...>
	 *
	 * in other words, we would treat the first non-option as the
	 * base_name and send everything else to the internal revision
	 * walker.
	 */

	if (!pack_to_stdout)
		base_name = argv[i++];

	if (pack_to_stdout != !base_name)
		usage(pack_usage);

2312 2313
	if (!pack_to_stdout && !pack_size_limit)
		pack_size_limit = pack_size_limit_cfg;
2314 2315
	if (pack_to_stdout && pack_size_limit)
		die("--max-pack-size cannot be used to build a pack for transfer.");
2316 2317 2318 2319
	if (pack_size_limit && pack_size_limit < 1024*1024) {
		warning("minimum pack size limit is 1 MiB");
		pack_size_limit = 1024*1024;
	}
2320

2321 2322
	if (!pack_to_stdout && thin)
		die("--thin cannot be used to build an indexable pack.");
2323

2324 2325 2326
	if (keep_unreachable && unpack_unreachable)
		die("--keep-unreachable and --unpack-unreachable are incompatible.");

2327 2328 2329
	if (progress && all_progress_implied)
		progress = 2;

2330 2331
	prepare_packed_git();

2332
	if (progress)
2333
		progress_state = start_progress("Counting objects", 0);
2334 2335
	if (!use_internal_rev_list)
		read_object_list_from_stdin();
2336 2337 2338 2339
	else {
		rp_av[rp_ac] = NULL;
		get_object_list(rp_ac, rp_av);
	}
2340
	cleanup_preferred_base();
2341 2342
	if (include_tag && nr_result)
		for_each_ref(add_ref_tag, NULL);
N
Nicolas Pitre 已提交
2343
	stop_progress(&progress_state);
N
Nicolas Pitre 已提交
2344

2345
	if (non_empty && !nr_result)
2346
		return 0;
2347 2348
	if (nr_result)
		prepare_pack(window, depth);
2349
	write_pack_file();
2350
	if (progress)
2351 2352
		fprintf(stderr, "Total %"PRIu32" (delta %"PRIu32"),"
			" reused %"PRIu32" (delta %"PRIu32")\n",
2353
			written, written_delta, reused, reused_delta);
2354 2355
	return 0;
}