From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Apr 2019 02:14:47 +0000 (+0900)
Subject: Merge branch 'dl/flex-str-cocci'
X-Git-Tag: v2.22.0-rc0~78
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5f65d7d9bcd4bd863127df1dc10546f2b82a6b68?ds=inline;hp=-c

Merge branch 'dl/flex-str-cocci'

Code clean-up.

* dl/flex-str-cocci:
cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR
midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STR
---

5f65d7d9bcd4bd863127df1dc10546f2b82a6b68
diff --combined midx.c
index f1cd868f8c,cb8190329a..f1137eb6ee
--- a/midx.c
+++ b/midx.c
@@@ -8,7 -8,6 +8,7 @@@
  #include "sha1-lookup.h"
  #include "midx.h"
  #include "progress.h"
 +#include "trace2.h"
  
  #define MIDX_SIGNATURE 0x4d494458 /* "MIDX" */
  #define MIDX_VERSION 1
@@@ -71,7 -70,7 +71,7 @@@ struct multi_pack_index *load_multi_pac
  
  	midx_map = xmmap(NULL, midx_size, PROT_READ, MAP_PRIVATE, fd, 0);
  
- 	FLEX_ALLOC_MEM(m, object_dir, object_dir, strlen(object_dir));
+ 	FLEX_ALLOC_STR(m, object_dir, object_dir);
  	m->fd = fd;
  	m->data = midx_map;
  	m->data_len = midx_size;
@@@ -165,9 -164,6 +165,9 @@@
  			      m->pack_names[i]);
  	}
  
 +	trace2_data_intmax("midx", the_repository, "load/num_packs", m->num_packs);
 +	trace2_data_intmax("midx", the_repository, "load/num_objects", m->num_objects);
 +
  	return m;
  
  cleanup_fail:
@@@ -962,35 -958,8 +962,35 @@@ static void midx_report(const char *fmt
  	va_end(ap);
  }
  
 +struct pair_pos_vs_id
 +{
 +	uint32_t pos;
 +	uint32_t pack_int_id;
 +};
 +
 +static int compare_pair_pos_vs_id(const void *_a, const void *_b)
 +{
 +	struct pair_pos_vs_id *a = (struct pair_pos_vs_id *)_a;
 +	struct pair_pos_vs_id *b = (struct pair_pos_vs_id *)_b;
 +
 +	return b->pack_int_id - a->pack_int_id;
 +}
 +
 +/*
 + * Limit calls to display_progress() for performance reasons.
 + * The interval here was arbitrarily chosen.
 + */
 +#define SPARSE_PROGRESS_INTERVAL (1 << 12)
 +#define midx_display_sparse_progress(progress, n) \
 +	do { \
 +		uint64_t _n = (n); \
 +		if ((_n & (SPARSE_PROGRESS_INTERVAL - 1)) == 0) \
 +			display_progress(progress, _n); \
 +	} while (0)
 +
  int verify_midx_file(const char *object_dir)
  {
 +	struct pair_pos_vs_id *pairs = NULL;
  	uint32_t i;
  	struct progress *progress;
  	struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
@@@ -999,15 -968,10 +999,15 @@@
  	if (!m)
  		return 0;
  
 +	progress = start_progress(_("Looking for referenced packfiles"),
 +				  m->num_packs);
  	for (i = 0; i < m->num_packs; i++) {
  		if (prepare_midx_pack(m, i))
  			midx_report("failed to load pack in position %d", i);
 +
 +		display_progress(progress, i + 1);
  	}
 +	stop_progress(&progress);
  
  	for (i = 0; i < 255; i++) {
  		uint32_t oid_fanout1 = ntohl(m->chunk_oid_fanout[i]);
@@@ -1018,8 -982,6 +1018,8 @@@
  				    i, oid_fanout1, oid_fanout2, i + 1);
  	}
  
 +	progress = start_sparse_progress(_("Verifying OID order in MIDX"),
 +					 m->num_objects - 1);
  	for (i = 0; i < m->num_objects - 1; i++) {
  		struct object_id oid1, oid2;
  
@@@ -1029,47 -991,18 +1029,47 @@@
  		if (oidcmp(&oid1, &oid2) >= 0)
  			midx_report(_("oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"),
  				    i, oid_to_hex(&oid1), oid_to_hex(&oid2), i + 1);
 +
 +		midx_display_sparse_progress(progress, i + 1);
  	}
 +	stop_progress(&progress);
  
 -	progress = start_progress(_("Verifying object offsets"), m->num_objects);
 +	/*
 +	 * Create an array mapping each object to its packfile id.  Sort it
 +	 * to group the objects by packfile.  Use this permutation to visit
 +	 * each of the objects and only require 1 packfile to be open at a
 +	 * time.
 +	 */
 +	ALLOC_ARRAY(pairs, m->num_objects);
 +	for (i = 0; i < m->num_objects; i++) {
 +		pairs[i].pos = i;
 +		pairs[i].pack_int_id = nth_midxed_pack_int_id(m, i);
 +	}
 +
 +	progress = start_sparse_progress(_("Sorting objects by packfile"),
 +					 m->num_objects);
 +	display_progress(progress, 0); /* TODO: Measure QSORT() progress */
 +	QSORT(pairs, m->num_objects, compare_pair_pos_vs_id);
 +	stop_progress(&progress);
 +
 +	progress = start_sparse_progress(_("Verifying object offsets"), m->num_objects);
  	for (i = 0; i < m->num_objects; i++) {
  		struct object_id oid;
  		struct pack_entry e;
  		off_t m_offset, p_offset;
  
 -		nth_midxed_object_oid(&oid, m, i);
 +		if (i > 0 && pairs[i-1].pack_int_id != pairs[i].pack_int_id &&
 +		    m->packs[pairs[i-1].pack_int_id])
 +		{
 +			close_pack_fd(m->packs[pairs[i-1].pack_int_id]);
 +			close_pack_index(m->packs[pairs[i-1].pack_int_id]);
 +		}
 +
 +		nth_midxed_object_oid(&oid, m, pairs[i].pos);
 +
  		if (!fill_midx_entry(&oid, &e, m)) {
  			midx_report(_("failed to load pack entry for oid[%d] = %s"),
 -				    i, oid_to_hex(&oid));
 +				    pairs[i].pos, oid_to_hex(&oid));
  			continue;
  		}
  
@@@ -1084,13 -1017,11 +1084,13 @@@
  
  		if (m_offset != p_offset)
  			midx_report(_("incorrect object offset for oid[%d] = %s: %"PRIx64" != %"PRIx64),
 -				    i, oid_to_hex(&oid), m_offset, p_offset);
 +				    pairs[i].pos, oid_to_hex(&oid), m_offset, p_offset);
  
 -		display_progress(progress, i + 1);
 +		midx_display_sparse_progress(progress, i + 1);
  	}
  	stop_progress(&progress);
  
 +	free(pairs);
 +
  	return verify_midx_error;
  }