On 10/1/2018 12:27 PM, Duy Nguyen wrote:
On Mon, Oct 1, 2018 at 3:46 PM Ben Peart <peart...@gmail.com> wrote:
@@ -1888,6 +1890,23 @@ static size_t estimate_cache_size(size_t ondisk_size,
unsigned int entries)
return ondisk_size + entries * per_entry;
}
+struct index_entry_offset
+{
+ /* starting byte offset into index file, count of index entries in this
block */
+ int offset, nr;
uint32_t?
+};
+
+struct index_entry_offset_table
+{
+ int nr;
+ struct index_entry_offset entries[0];
Use FLEX_ARRAY. Some compilers are not happy with an array of zero
items if I remember correctly.
Thanks for the warning, I'll update that.
@@ -2523,6 +2551,9 @@ static int do_write_index(struct index_state *istate,
struct tempfile *tempfile,
struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
int drop_cache_tree = istate->drop_cache_tree;
off_t offset;
+ int ieot_work = 1;
+ struct index_entry_offset_table *ieot = NULL;
+ int nr;
There are a bunch of stuff going on in this function, maybe rename
this to nr_threads or nr_blocks to be less generic.
I can add a nr_threads variable to make this more obvious.
for (i = removed = extended = 0; i < entries; i++) {
if (cache[i]->ce_flags & CE_REMOVE)
@@ -2556,7 +2587,38 @@ static int do_write_index(struct index_state *istate,
struct tempfile *tempfile,
if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
return -1;
+#ifndef NO_PTHREADS
+ if ((nr = git_config_get_index_threads()) != 1) {
Maybe keep this assignment out of "if".
+ int ieot_blocks, cpus;
+
+ /*
+ * ensure default number of ieot blocks maps evenly to the
+ * default number of threads that will process them
+ */
+ if (!nr) {
+ ieot_blocks = istate->cache_nr / THREAD_COST;
+ cpus = online_cpus();
+ if (ieot_blocks > cpus - 1)
+ ieot_blocks = cpus - 1;
The " - 1" here is for extension thread, yes? Probably worth a comment.
+ } else {
+ ieot_blocks = nr;
+ }
+
+ /*
+ * no reason to write out the IEOT extension if we don't
+ * have enough blocks to utilize multi-threading
+ */
+ if (ieot_blocks > 1) {
+ ieot = xcalloc(1, sizeof(struct
index_entry_offset_table)
+ + (ieot_blocks * sizeof(struct
index_entry_offset)));
Use FLEX_ALLOC_MEM() after you declare ..._table with FLEX_ARRAY.
FLEX_ALLOC_MEM() is focused on variable length "char" data. All uses of
FLEX_ARRAY with non char data did the allocation themselves to avoid the
unnecessary memcpy() that comes with FLEX_ALLOC_MEM.
This ieot needs to be freed also and should be before any "return -1"
in this function.
Good catch. Will do.
+ ieot->nr = 0;
+ ieot_work = DIV_ROUND_UP(entries, ieot_blocks);
Perhaps a better name for ioet_work? This looks like the number of
cache entries per block.
+ }
+ }
+#endif
+
offset = lseek(newfd, 0, SEEK_CUR) + write_buffer_len;
+ nr = 0;
Eh.. repurpose nr to count cache entries now? It's kinda hard to follow.
previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
for (i = 0; i < entries; i++) {
@@ -2578,11 +2640,31 @@ static int do_write_index(struct index_state *istate,
struct tempfile *tempfile,
drop_cache_tree = 1;
}
+ if (ieot && i && (i % ieot_work == 0)) {
+ ieot->entries[ieot->nr].nr = nr;
+ ieot->entries[ieot->nr].offset = offset;
+ ieot->nr++;
+ /*
+ * If we have a V4 index, set the first byte to an
invalid
+ * character to ensure there is nothing common with the
previous
+ * entry
+ */
+ if (previous_name)
+ previous_name->buf[0] = 0;
+ nr = 0;
+ offset = lseek(newfd, 0, SEEK_CUR) + write_buffer_len;
This only works correctly if the ce_write_entry() from the last
iteration has flushed everything to out to newfd. Maybe it does, but
it's error prone to rely on that in my opinion. Maybe we need an
explicit ce_write_flush() here to make sure.
This logic already takes any unflushed data into account - the offset is
what has been flushed to disk (lseek) plus the amount still in the
buffer (write_buffer_len) waiting to be flushed. I don't see any need
to force an additional flush and adding one could have a negative impact
on performance.
+ }
if (ce_write_entry(&c, newfd, ce, previous_name, (struct
ondisk_cache_entry *)&ondisk) < 0)
err = -1;
if (err)
break;
+ nr++;
+ }
+ if (ieot && nr) {
+ ieot->entries[ieot->nr].nr = nr;
+ ieot->entries[ieot->nr].offset = offset;
+ ieot->nr++;
}
strbuf_release(&previous_name_buf);
@@ -2593,6 +2675,26 @@ static int do_write_index(struct index_state *istate,
struct tempfile *tempfile,
offset = lseek(newfd, 0, SEEK_CUR) + write_buffer_len;
the_hash_algo->init_fn(&eoie_c);
+ /*
+ * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
+ * can minimze the number of extensions we have to scan through to
s/minimze/minimize/
+ * find it during load. Write it out regardless of the
+ * strip_extensions parameter as we need it when loading the shared
+ * index.
+ */
+#ifndef NO_PTHREADS
+ if (ieot) {
+ struct strbuf sb = STRBUF_INIT;
+
+ write_ieot_extension(&sb, ieot);
+ err = write_index_ext_header(&c, &eoie_c, newfd,
CACHE_EXT_INDEXENTRYOFFSETTABLE, sb.len) < 0
+ || ce_write(&c, newfd, sb.buf, sb.len) < 0;
+ strbuf_release(&sb);
+ if (err)
+ return -1;
+ }
+#endif
+
if (!strip_extensions && istate->split_index) {
struct strbuf sb = STRBUF_INIT;
@@ -3176,3 +3278,74 @@ static void write_eoie_extension(struct strbuf *sb,
git_hash_ctx *eoie_context,
the_hash_algo->final_fn(hash, eoie_context);
strbuf_add(sb, hash, the_hash_algo->rawsz);
}
+
+#ifndef NO_PTHREADS
+#define IEOT_VERSION (1)
+
+static struct index_entry_offset_table *read_ieot_extension(const char *mmap,
size_t mmap_size, size_t offset)
+{
+ const char *index = NULL;
+ uint32_t extsize, ext_version;
+ struct index_entry_offset_table *ieot;
+ int i, nr;
+
+ /* find the IEOT extension */
+ if (!offset)
+ return NULL;
+ while (offset <= mmap_size - the_hash_algo->rawsz - 8) {
+ extsize = get_be32(mmap + offset + 4);
+ if (CACHE_EXT((mmap + offset)) ==
CACHE_EXT_INDEXENTRYOFFSETTABLE) {
+ index = mmap + offset + 4 + 4;
+ break;
+ }
+ offset += 8;
+ offset += extsize;
+ }
Maybe refactor this loop. I think I've seen this in at least two
places now. Probably three?
+ if (!index)
+ return NULL;
+
+ /* validate the version is IEOT_VERSION */
+ ext_version = get_be32(index);
+ if (ext_version != IEOT_VERSION)
+ return NULL;
Report the error (e.g. "unsupported version" or something)
Sure. I'll add reporting here and in the error check below.
+ index += sizeof(uint32_t);
+
+ /* extension size - version bytes / bytes per entry */
+ nr = (extsize - sizeof(uint32_t)) / (sizeof(uint32_t) +
sizeof(uint32_t));
Do we need to check if "(extsize - version) % sizeof(entry) == 0"?
+ if (!nr)
+ return NULL;
+ ieot = xmalloc(sizeof(struct index_entry_offset_table)
+ + (nr * sizeof(struct index_entry_offset)));
+ ieot->nr = nr;
+ for (i = 0; i < nr; i++) {
+ ieot->entries[i].offset = get_be32(index);
+ index += sizeof(uint32_t);
+ ieot->entries[i].nr = get_be32(index);
+ index += sizeof(uint32_t);
+ }
+
+ return ieot;
+}
+
+static void write_ieot_extension(struct strbuf *sb, struct
index_entry_offset_table *ieot)
+{
+ uint32_t buffer;
+ int i;
+
+ /* version */
+ put_be32(&buffer, IEOT_VERSION);
+ strbuf_add(sb, &buffer, sizeof(uint32_t));
+
+ /* ieot */
+ for (i = 0; i < ieot->nr; i++) {
+
+ /* offset */
+ put_be32(&buffer, ieot->entries[i].offset);
+ strbuf_add(sb, &buffer, sizeof(uint32_t));
+
+ /* count */
+ put_be32(&buffer, ieot->entries[i].nr);
+ strbuf_add(sb, &buffer, sizeof(uint32_t));
+ }
+}
+#endif
--
2.18.0.windows.1
