Thanks to visit codestin.com
Credit goes to github.com

Skip to content

sp_ar.c: implement ST_DELETE #10

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

Closed
wants to merge 1 commit into from
Closed

sp_ar.c: implement ST_DELETE #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 23 additions & 6 deletions sp_ar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ sa_free_table(sa_table *table)
sa_table_dealloc(table);
}

int
sa_delete(sa_table *table, sa_index_t key, st_data_t *value)
static int
sa_delete_internal(sa_table *table, sa_index_t key, st_data_t *value)
{
sa_index_t pos, prev_pos = ~0;
sa_entry *entry;
Expand All @@ -314,9 +314,6 @@ sa_delete(sa_table *table, sa_index_t key, st_data_t *value)
}
}
table->num_entries--;
if (table->num_entries < table->num_bins / 4) {
resize(table);
}
return 1;
}
if (entry->next == SA_LAST) break;
Expand All @@ -330,6 +327,16 @@ sa_delete(sa_table *table, sa_index_t key, st_data_t *value)
return 0;
}

int
sa_delete(sa_table *table, sa_index_t key, st_data_t *value)
{
int res = sa_delete_internal(table, key, value);
if (res == 1 && table->num_entries < table->num_bins / 4) {
resize(table);
}
return res;
}

int
sa_foreach(register sa_table *table, int (*func)(), st_data_t arg)
{
Expand All @@ -344,7 +351,17 @@ sa_foreach(register sa_table *table, int (*func)(), st_data_t arg)
st_data_t val = table->entries[i].value;
ret = (*func)(key, val, arg);
if (ret == SA_STOP) break;
/* else if (ret == SA_DELETE) TODO: implement */
else if (ret == SA_DELETE) {
/* it is stable only in term of single iteration */
/* do not parallel iteration, please */
sa_index_t next = table->entries[i].next;
sa_delete_internal(table, key, NULL);
/* if item remains after deletion, then it is other item, */
/* moved from `next` position */
if (next > i + SA_OFFSET && table->entries[i].next != SA_EMPTY) {
i--;
}
}
}
}
return 0;
Expand Down