Am 01.04.20 um 12:24 schrieb Jeff King:
> On Wed, Apr 01, 2020 at 01:21:08AM +0200, René Scharfe wrote:
>
>>>> + pos = kh_put_object_entry_set(&object_table, (struct object_entry *)oid, &was_empty);
>>>
>>> Now this looks illegal. khash is surely reading a full object_entry from oid,
>>> which only is a mere object_id, no?
>>
>> No, it's a set of pointers, and khash only accesses the referenced objects
>> via the hash and comparison functions.
>>
>> Storing the objects directly in the set and getting rid of new_object()
>> could improve performance due to reduced dereferencing overhead -- or
>> make it slower because more data has to be copied when the hashmap needs
>> to grow. Worth a shot. Later.
>
> Yeah. I tried that, too, but it caused tons of test failures. Quite
> possibly just a bug in my patch, which I did as quickly as possible. But
> I think it performed about the same. Here it is for reference (though
> you may be better off to start from scratch).
Tried that earlier, ran into failures as well. I think the pointer
returned from insert_object() is stored somewhere and still used after
the next call, which could have invalidated it by a rehash. E.g.
insert_mark() seems to do that.
> Note the "this is OK to cast from oid to object_entry" comment is
> leftover from the earlier attempt, but it probably _isn't_ OK. Even
> though we don't do anything actionable on the non-oid bytes, they do get
> passed by value, which could mean reading random bytes.
"Value" meaning pointer value when KHASH_INIT is give a pointer type,
as was the case in the patch with that comment (unlike in the patch
below). So it should be OK there.
>
> ---
> diff --git a/fast-import.c b/fast-import.c
> index 202dda11a6..5a1b451971 100644
> --- a/fast-import.c
> +++ b/fast-import.c
> @@ -39,18 +39,24 @@
>
> struct object_entry {
> struct pack_idx_entry idx;
> - struct object_entry *next;
> uint32_t type : TYPE_BITS,
> pack_id : PACK_ID_BITS,
> depth : DEPTH_BITS;
> };
>
> -struct object_entry_pool {
> - struct object_entry_pool *next_pool;
> - struct object_entry *next_free;
> - struct object_entry *end;
> - struct object_entry entries[FLEX_ARRAY]; /* more */
> -};
> +static inline unsigned int object_entry_hash(struct object_entry oe)
> +{
> + return oidhash(&oe.idx.oid);
> +}
> +
> +static inline int object_entry_equal(struct object_entry a,
> + struct object_entry b)
> +{
> + return oideq(&a.idx.oid, &b.idx.oid);
> +}
> +
> +KHASH_INIT(object_entry_set, struct object_entry, int, 0,
> + object_entry_hash, object_entry_equal);
>
> struct mark_set {
> union {
> @@ -176,9 +182,7 @@ static struct packed_git **all_packs;
> static off_t pack_size;
>
> /* Table of objects we've written. */
> -static unsigned int object_entry_alloc = 5000;
> -static struct object_entry_pool *blocks;
> -static struct object_entry *object_table[1 << 16];
> +static kh_object_entry_set_t object_table;
> static struct mark_set *marks;
> static const char *export_marks_file;
> static const char *import_marks_file;
> @@ -428,71 +432,44 @@ static void set_checkpoint_signal(void)
>
> #endif
>
> -static void alloc_objects(unsigned int cnt)
> -{
> - struct object_entry_pool *b;
> -
> - b = xmalloc(sizeof(struct object_entry_pool)
> - + cnt * sizeof(struct object_entry));
> - b->next_pool = blocks;
> - b->next_free = b->entries;
> - b->end = b->entries + cnt;
> - blocks = b;
> - alloc_count += cnt;
> -}
> -
> -static struct object_entry *new_object(struct object_id *oid)
> -{
> - struct object_entry *e;
> -
> - if (blocks->next_free == blocks->end)
> - alloc_objects(object_entry_alloc);
> -
> - e = blocks->next_free++;
> - oidcpy(&e->idx.oid, oid);
> - return e;
> -}
> -
> static struct object_entry *find_object(struct object_id *oid)
> {
> - unsigned int h = oid->hash[0] << 8 | oid->hash[1];
> - struct object_entry *e;
> - for (e = object_table[h]; e; e = e->next)
> - if (oideq(oid, &e->idx.oid))
> - return e;
> + /*
> + * this cast works because we only look at the oid part of the entry,
> + * and it comes first in the struct
> + */
> + khiter_t pos = kh_get_object_entry_set(&object_table,
> + *(struct object_entry *)oid);
Yeah, this one here is not OK. We'd need to build a dummy entry.
> + if (pos != kh_end(&object_table))
> + return &kh_key(&object_table, pos);
> return NULL;
> }
>
> static struct object_entry *insert_object(struct object_id *oid)
> {
> - unsigned int h = oid->hash[0] << 8 | oid->hash[1];
> - struct object_entry *e = object_table[h];
> + struct object_entry e;
> + int was_empty;
> + khiter_t pos;
>
> - while (e) {
> - if (oideq(oid, &e->idx.oid))
> - return e;
> - e = e->next;
> - }
> + oidcpy(&e.idx.oid, oid);
> + e.idx.offset = 0;
> + pos = kh_put_object_entry_set(&object_table, e, &was_empty);
>
> - e = new_object(oid);
> - e->next = object_table[h];
> - e->idx.offset = 0;
> - object_table[h] = e;
> - return e;
> + return &kh_key(&object_table, pos);
> }
>
> static void invalidate_pack_id(unsigned int id)
> {
> - unsigned int h;
> unsigned long lu;
> struct tag *t;
> + khiter_t iter;
>
> - for (h = 0; h < ARRAY_SIZE(object_table); h++) {
> - struct object_entry *e;
> -
> - for (e = object_table[h]; e; e = e->next)
> + for (iter = kh_begin(&object_table); iter != kh_end(&object_table); iter++) {
> + if (kh_exist(&object_table, iter)) {
> + struct object_entry *e = &kh_key(&object_table, iter);
> if (e->pack_id == id)
> e->pack_id = MAX_PACK_ID;
> + }
> }
>
> for (lu = 0; lu < branch_table_sz; lu++) {
> @@ -766,15 +743,18 @@ static const char *create_index(void)
> const char *tmpfile;
> struct pack_idx_entry **idx, **c, **last;
> struct object_entry *e;
> - struct object_entry_pool *o;
> + khiter_t iter;
>
> /* Build the table of object IDs. */
> ALLOC_ARRAY(idx, object_count);
> c = idx;
> - for (o = blocks; o; o = o->next_pool)
> - for (e = o->next_free; e-- != o->entries;)
> + for (iter = kh_begin(&object_table); iter != kh_end(&object_table); iter++) {
> + if (kh_exist(&object_table, iter)) {
> + e = &kh_key(&object_table, iter);
> if (pack_id == e->pack_id)
> *c++ = &e->idx;
> + }
> + }
The original code writes the objects in reverse order of their creation
(LIFO), right? Is that relevant?
But anyway, we need stable object locations anyway if their addresses are
stored in other structs, as mentioned above. Those pointers would have to
be replaced by object_ids and pointer derefs by hashmap lookups. Not a
promising direction.
René
