Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize hash table insertion #2107

Merged
merged 5 commits into from
Oct 4, 2023
Merged

Optimize hash table insertion #2107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55936cb
hash_table REFACTOR simplify collision management
olivier-matz-6wind Sep 21, 2023
0c76cb2
hash_table UPDATE insert record at the end of the hlist
olivier-matz-6wind Sep 28, 2023
5d43e55
hash_table FEATURE new api to insert without lookup
olivier-matz-6wind Sep 28, 2023
e764b3f
tree_data OPTIMIZE don't check dups on htable insertion
olivier-matz-6wind Sep 21, 2023
9f69558
tree_data OPTIMIZE optimize creation of children htable
olivier-matz-6wind Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions src/dict.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,25 +70,23 @@ lydict_clean(struct ly_dict *dict)
{
struct ly_dict_rec *dict_rec = NULL;
struct ly_ht_rec *rec = NULL;
uint32_t hlist_idx;
uint32_t rec_idx;

LY_CHECK_ARG_RET(NULL, dict, );

for (uint32_t i = 0; i < dict->hash_tab->size; i++) {
/* get ith record */
rec = (struct ly_ht_rec *)&dict->hash_tab->recs[i * dict->hash_tab->rec_size];
if (rec->hits == 1) {
/*
* this should not happen, all records inserted into
* dictionary are supposed to be removed using lydict_remove()
* before calling lydict_clean()
*/
dict_rec = (struct ly_dict_rec *)rec->val;
LOGWRN(NULL, "String \"%s\" not freed from the dictionary, refcount %d", dict_rec->value, dict_rec->refcount);
/* if record wasn't removed before free string allocated for that record */
LYHT_ITER_ALL_RECS(dict->hash_tab, hlist_idx, rec_idx, rec) {
/*
* this should not happen, all records inserted into
* dictionary are supposed to be removed using lydict_remove()
* before calling lydict_clean()
*/
dict_rec = (struct ly_dict_rec *)rec->val;
LOGWRN(NULL, "String \"%s\" not freed from the dictionary, refcount %d", dict_rec->value, dict_rec->refcount);
/* if record wasn't removed before free string allocated for that record */
#ifdef NDEBUG
free(dict_rec->value);
free(dict_rec->value);
#endif
}
}

/* free table and destroy mutex */
Expand Down
Loading
Loading