mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-07-27 10:04:18 +00:00
Merge pull request #4723 from sworleys/List-Del-API
List API add const and return object on `*_del`
This commit is contained in:
David Lamparter
GitHub
commit
2e2094b7d2
@ -135,8 +135,10 @@ macro_inline void prefix ## _add_tail(struct prefix##_head *h, type *item) \
|
||||
macro_inline void prefix ## _del_hint(struct prefix##_head *h, type *item, \
|
||||
_Atomic atomptr_t *hint) \
|
||||
{ atomlist_del_hint(&h->ah, &item->field.ai, hint); } \
|
||||
macro_inline void prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
{ atomlist_del_hint(&h->ah, &item->field.ai, NULL); } \
|
||||
macro_inline type *prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
{ atomlist_del_hint(&h->ah, &item->field.ai, NULL); \
|
||||
/* TODO: Return NULL if not found */ \
|
||||
return item; } \
|
||||
macro_inline type *prefix ## _pop(struct prefix##_head *h) \
|
||||
{ char *p = (char *)atomlist_pop(&h->ah); \
|
||||
return p ? (type *)(p - offsetof(type, field)) : NULL; } \
|
||||
@ -273,9 +275,11 @@ macro_inline void prefix ## _del_hint(struct prefix##_head *h, type *item, \
|
||||
{ \
|
||||
atomsort_del_hint(&h->ah, &item->field.ai, hint); \
|
||||
} \
|
||||
macro_inline void prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
macro_inline type *prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
{ \
|
||||
atomsort_del_hint(&h->ah, &item->field.ai, NULL); \
|
||||
/* TODO: Return NULL if not found */ \
|
||||
return item; \
|
||||
} \
|
||||
macro_inline size_t prefix ## _count(struct prefix##_head *h) \
|
||||
{ \
|
||||
|
||||
@ -333,9 +333,10 @@ color:
|
||||
return (old);
|
||||
}
|
||||
|
||||
void typed_rb_remove(struct rbt_tree *rbt, struct rb_entry *rbe)
|
||||
struct typed_rb_entry *typed_rb_remove(struct rbt_tree *rbt,
|
||||
struct rb_entry *rbe)
|
||||
{
|
||||
rbe_remove(rbt, rbe);
|
||||
return rbe_remove(rbt, rbe);
|
||||
}
|
||||
|
||||
struct typed_rb_entry *typed_rb_insert(struct rbt_tree *rbt,
|
||||
|
||||
23
lib/typerb.h
23
lib/typerb.h
@ -38,29 +38,30 @@ struct typed_rb_root {
|
||||
size_t count;
|
||||
};
|
||||
|
||||
struct typed_rb_entry *typed_rb_insert(struct typed_rb_root *,
|
||||
struct typed_rb_entry *typed_rb_insert(struct typed_rb_root *rbt,
|
||||
struct typed_rb_entry *rbe,
|
||||
int (*cmpfn)(
|
||||
const struct typed_rb_entry *a,
|
||||
const struct typed_rb_entry *b));
|
||||
void typed_rb_remove(struct typed_rb_root *, struct typed_rb_entry *rbe);
|
||||
struct typed_rb_entry *typed_rb_find(struct typed_rb_root *,
|
||||
struct typed_rb_entry *typed_rb_remove(struct typed_rb_root *rbt,
|
||||
struct typed_rb_entry *rbe);
|
||||
struct typed_rb_entry *typed_rb_find(struct typed_rb_root *rbt,
|
||||
const struct typed_rb_entry *rbe,
|
||||
int (*cmpfn)(
|
||||
const struct typed_rb_entry *a,
|
||||
const struct typed_rb_entry *b));
|
||||
struct typed_rb_entry *typed_rb_find_gteq(struct typed_rb_root *,
|
||||
struct typed_rb_entry *typed_rb_find_gteq(struct typed_rb_root *rbt,
|
||||
const struct typed_rb_entry *rbe,
|
||||
int (*cmpfn)(
|
||||
const struct typed_rb_entry *a,
|
||||
const struct typed_rb_entry *b));
|
||||
struct typed_rb_entry *typed_rb_find_lt(struct typed_rb_root *,
|
||||
struct typed_rb_entry *typed_rb_find_lt(struct typed_rb_root *rbt,
|
||||
const struct typed_rb_entry *rbe,
|
||||
int (*cmpfn)(
|
||||
const struct typed_rb_entry *a,
|
||||
const struct typed_rb_entry *b));
|
||||
struct typed_rb_entry *typed_rb_min(struct typed_rb_root *);
|
||||
struct typed_rb_entry *typed_rb_next(struct typed_rb_entry *);
|
||||
struct typed_rb_entry *typed_rb_min(struct typed_rb_root *rbt);
|
||||
struct typed_rb_entry *typed_rb_next(struct typed_rb_entry *rbe);
|
||||
|
||||
#define _PREDECL_RBTREE(prefix) \
|
||||
struct prefix ## _head { struct typed_rb_root rr; }; \
|
||||
@ -99,9 +100,11 @@ macro_inline type *prefix ## _find_lt(struct prefix##_head *h, \
|
||||
re = typed_rb_find_lt(&h->rr, &item->field.re, cmpfn_nuq); \
|
||||
return container_of_null(re, type, field.re); \
|
||||
} \
|
||||
macro_inline void prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
macro_inline type *prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
{ \
|
||||
typed_rb_remove(&h->rr, &item->field.re); \
|
||||
struct typed_rb_entry *re; \
|
||||
re = typed_rb_remove(&h->rr, &item->field.re); \
|
||||
return container_of_null(re, type, field.re); \
|
||||
} \
|
||||
macro_inline type *prefix ## _pop(struct prefix##_head *h) \
|
||||
{ \
|
||||
@ -130,7 +133,7 @@ macro_pure type *prefix ## _next_safe(struct prefix##_head *h, type *item) \
|
||||
re = item ? typed_rb_next(&item->field.re) : NULL; \
|
||||
return container_of_null(re, type, field.re); \
|
||||
} \
|
||||
macro_pure size_t prefix ## _count(struct prefix##_head *h) \
|
||||
macro_pure size_t prefix ## _count(const struct prefix##_head *h) \
|
||||
{ \
|
||||
return h->rr.count; \
|
||||
} \
|
||||
|
||||
@ -341,13 +341,14 @@ struct sskip_item *typesafe_skiplist_find_lt(struct sskip_head *head,
|
||||
return best;
|
||||
}
|
||||
|
||||
void typesafe_skiplist_del(struct sskip_head *head, struct sskip_item *item,
|
||||
int (*cmpfn)(const struct sskip_item *a,
|
||||
const struct sskip_item *b))
|
||||
struct sskip_item *typesafe_skiplist_del(
|
||||
struct sskip_head *head, struct sskip_item *item,
|
||||
int (*cmpfn)(const struct sskip_item *a, const struct sskip_item *b))
|
||||
{
|
||||
size_t level = SKIPLIST_MAXDEPTH;
|
||||
struct sskip_item *prev = &head->hitem, *next;
|
||||
int cmpval;
|
||||
bool found = false;
|
||||
|
||||
while (level) {
|
||||
next = sl_level_get(prev, level - 1);
|
||||
@ -359,6 +360,7 @@ void typesafe_skiplist_del(struct sskip_head *head, struct sskip_item *item,
|
||||
sl_level_set(prev, level - 1,
|
||||
sl_level_get(item, level - 1));
|
||||
level--;
|
||||
found = true;
|
||||
continue;
|
||||
}
|
||||
cmpval = cmpfn(next, item);
|
||||
@ -369,6 +371,9 @@ void typesafe_skiplist_del(struct sskip_head *head, struct sskip_item *item,
|
||||
level--;
|
||||
}
|
||||
|
||||
if (!found)
|
||||
return NULL;
|
||||
|
||||
/* TBD: assert when trying to remove non-existing item? */
|
||||
head->count--;
|
||||
|
||||
@ -379,6 +384,8 @@ void typesafe_skiplist_del(struct sskip_head *head, struct sskip_item *item,
|
||||
XFREE(MTYPE_SKIPLIST_OFLOW, oflow);
|
||||
}
|
||||
memset(item, 0, sizeof(*item));
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
struct sskip_item *typesafe_skiplist_pop(struct sskip_head *head)
|
||||
|
||||
@ -109,17 +109,18 @@ macro_inline void prefix ## _add_after(struct prefix##_head *h, \
|
||||
typesafe_list_add(&h->sh, nextp, &item->field.si); \
|
||||
} \
|
||||
/* TODO: del_hint */ \
|
||||
macro_inline void prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
macro_inline type *prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
{ \
|
||||
struct slist_item **iter = &h->sh.first; \
|
||||
while (*iter && *iter != &item->field.si) \
|
||||
iter = &(*iter)->next; \
|
||||
if (!*iter) \
|
||||
return; \
|
||||
return NULL; \
|
||||
h->sh.count--; \
|
||||
*iter = item->field.si.next; \
|
||||
if (!item->field.si.next) \
|
||||
h->sh.last_next = iter; \
|
||||
return item; \
|
||||
} \
|
||||
macro_inline type *prefix ## _pop(struct prefix##_head *h) \
|
||||
{ \
|
||||
@ -149,7 +150,7 @@ macro_pure type *prefix ## _next_safe(struct prefix##_head *h, type *item) \
|
||||
sitem = &item->field.si; \
|
||||
return container_of_null(sitem->next, type, field.si); \
|
||||
} \
|
||||
macro_pure size_t prefix ## _count(struct prefix##_head *h) \
|
||||
macro_pure size_t prefix ## _count(const struct prefix##_head *h) \
|
||||
{ \
|
||||
return h->sh.count; \
|
||||
} \
|
||||
@ -212,13 +213,14 @@ macro_inline void prefix ## _add_after(struct prefix##_head *h, \
|
||||
prev = after ? &after->field.di : &h->dh.hitem; \
|
||||
typesafe_dlist_add(&h->dh, prev, &item->field.di); \
|
||||
} \
|
||||
macro_inline void prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
macro_inline type *prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
{ \
|
||||
struct dlist_item *ditem = &item->field.di; \
|
||||
ditem->prev->next = ditem->next; \
|
||||
ditem->next->prev = ditem->prev; \
|
||||
h->dh.count--; \
|
||||
ditem->prev = ditem->next = NULL; \
|
||||
return item; \
|
||||
} \
|
||||
macro_inline type *prefix ## _pop(struct prefix##_head *h) \
|
||||
{ \
|
||||
@ -250,7 +252,7 @@ macro_pure type *prefix ## _next_safe(struct prefix##_head *h, type *item) \
|
||||
return NULL; \
|
||||
return prefix ## _next(h, item); \
|
||||
} \
|
||||
macro_pure size_t prefix ## _count(struct prefix##_head *h) \
|
||||
macro_pure size_t prefix ## _count(const struct prefix##_head *h) \
|
||||
{ \
|
||||
return h->dh.count; \
|
||||
} \
|
||||
@ -308,7 +310,7 @@ macro_inline type *prefix ## _add(struct prefix##_head *h, type *item) \
|
||||
h->hh.count++; \
|
||||
return NULL; \
|
||||
} \
|
||||
macro_inline void prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
macro_inline type *prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
{ \
|
||||
struct heap_item *other; \
|
||||
uint32_t index = item->field.hi.index; \
|
||||
@ -321,6 +323,7 @@ macro_inline void prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
typesafe_heap_pushdown(&h->hh, index, other, prefix ## __cmp); \
|
||||
if (HEAP_RESIZE_TRESH_DN(h)) \
|
||||
typesafe_heap_resize(&h->hh, false); \
|
||||
return item; \
|
||||
} \
|
||||
macro_inline type *prefix ## _pop(struct prefix##_head *h) \
|
||||
{ \
|
||||
@ -354,7 +357,7 @@ macro_pure type *prefix ## _next_safe(struct prefix##_head *h, type *item) \
|
||||
return NULL; \
|
||||
return prefix ## _next(h, item); \
|
||||
} \
|
||||
macro_pure size_t prefix ## _count(struct prefix##_head *h) \
|
||||
macro_pure size_t prefix ## _count(const struct prefix##_head *h) \
|
||||
{ \
|
||||
return h->hh.count; \
|
||||
} \
|
||||
@ -449,15 +452,16 @@ macro_inline type *prefix ## _find_lt(struct prefix##_head *h, \
|
||||
return container_of_null(prev, type, field.si); \
|
||||
} \
|
||||
/* TODO: del_hint */ \
|
||||
macro_inline void prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
macro_inline type *prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
{ \
|
||||
struct ssort_item **iter = &h->sh.first; \
|
||||
while (*iter && *iter != &item->field.si) \
|
||||
iter = &(*iter)->next; \
|
||||
if (!*iter) \
|
||||
return; \
|
||||
return NULL; \
|
||||
h->sh.count--; \
|
||||
*iter = item->field.si.next; \
|
||||
return item; \
|
||||
} \
|
||||
macro_inline type *prefix ## _pop(struct prefix##_head *h) \
|
||||
{ \
|
||||
@ -485,7 +489,7 @@ macro_pure type *prefix ## _next_safe(struct prefix##_head *h, type *item) \
|
||||
sitem = &item->field.si; \
|
||||
return container_of_null(sitem->next, type, field.si); \
|
||||
} \
|
||||
macro_pure size_t prefix ## _count(struct prefix##_head *h) \
|
||||
macro_pure size_t prefix ## _count(const struct prefix##_head *h) \
|
||||
{ \
|
||||
return h->sh.count; \
|
||||
} \
|
||||
@ -617,10 +621,10 @@ macro_inline type *prefix ## _find(struct prefix##_head *h, const type *item) \
|
||||
} \
|
||||
return NULL; \
|
||||
} \
|
||||
macro_inline void prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
macro_inline type *prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
{ \
|
||||
if (!h->hh.tabshift) \
|
||||
return; \
|
||||
return NULL; \
|
||||
uint32_t hval = item->field.hi.hashval, hbits = HASH_KEY(h->hh, hval); \
|
||||
struct thash_item **np = &h->hh.entries[hbits]; \
|
||||
while (*np && (*np)->hashval < hval) \
|
||||
@ -628,12 +632,13 @@ macro_inline void prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
while (*np && *np != &item->field.hi && (*np)->hashval == hval) \
|
||||
np = &(*np)->next; \
|
||||
if (*np != &item->field.hi) \
|
||||
return; \
|
||||
return NULL; \
|
||||
*np = item->field.hi.next; \
|
||||
item->field.hi.next = NULL; \
|
||||
h->hh.count--; \
|
||||
if (HASH_SHRINK_THRESHOLD(h->hh)) \
|
||||
typesafe_hash_shrink(&h->hh); \
|
||||
return item; \
|
||||
} \
|
||||
macro_inline type *prefix ## _pop(struct prefix##_head *h) \
|
||||
{ \
|
||||
@ -675,7 +680,7 @@ macro_pure type *prefix ## _next_safe(struct prefix##_head *h, type *item) \
|
||||
return NULL; \
|
||||
return prefix ## _next(h, item); \
|
||||
} \
|
||||
macro_pure size_t prefix ## _count(struct prefix##_head *h) \
|
||||
macro_pure size_t prefix ## _count(const struct prefix##_head *h) \
|
||||
{ \
|
||||
return h->hh.count; \
|
||||
} \
|
||||
@ -751,9 +756,11 @@ macro_inline type *prefix ## _find_lt(struct prefix##_head *h, \
|
||||
&item->field.si, cmpfn_nuq); \
|
||||
return container_of_null(sitem, type, field.si); \
|
||||
} \
|
||||
macro_inline void prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
macro_inline type *prefix ## _del(struct prefix##_head *h, type *item) \
|
||||
{ \
|
||||
typesafe_skiplist_del(&h->sh, &item->field.si, cmpfn_uq); \
|
||||
struct sskip_item *sitem = typesafe_skiplist_del(&h->sh, \
|
||||
&item->field.si, cmpfn_uq); \
|
||||
return container_of_null(sitem, type, field.si); \
|
||||
} \
|
||||
macro_inline type *prefix ## _pop(struct prefix##_head *h) \
|
||||
{ \
|
||||
@ -776,7 +783,7 @@ macro_pure type *prefix ## _next_safe(struct prefix##_head *h, type *item) \
|
||||
next = item ? item->field.si.next[0] : NULL; \
|
||||
return container_of_null(next, type, field.si); \
|
||||
} \
|
||||
macro_pure size_t prefix ## _count(struct prefix##_head *h) \
|
||||
macro_pure size_t prefix ## _count(const struct prefix##_head *h) \
|
||||
{ \
|
||||
return h->sh.count; \
|
||||
} \
|
||||
@ -848,8 +855,8 @@ extern struct sskip_item *typesafe_skiplist_find_lt(struct sskip_head *head,
|
||||
const struct sskip_item *item, int (*cmpfn)(
|
||||
const struct sskip_item *a,
|
||||
const struct sskip_item *b));
|
||||
extern void typesafe_skiplist_del(struct sskip_head *head,
|
||||
struct sskip_item *item, int (*cmpfn)(
|
||||
extern struct sskip_item *typesafe_skiplist_del(
|
||||
struct sskip_head *head, struct sskip_item *item, int (*cmpfn)(
|
||||
const struct sskip_item *a,
|
||||
const struct sskip_item *b));
|
||||
extern struct sskip_item *typesafe_skiplist_pop(struct sskip_head *head);
|
||||
|
||||
@ -209,7 +209,7 @@ static void concat(test_, TYPE)(void)
|
||||
assert(list_add(&head, &dummy) == &itm[j]);
|
||||
else {
|
||||
assert(list_add(&head, &dummy) == NULL);
|
||||
list_del(&head, &dummy);
|
||||
assert(list_del(&head, &dummy) != NULL);
|
||||
}
|
||||
}
|
||||
ts_hashx("add-dup", "a538546a6e6ab0484e925940aa8dd02fd934408bbaed8cb66a0721841584d838");
|
||||
@ -255,7 +255,7 @@ static void concat(test_, TYPE)(void)
|
||||
list_first(&head) == &dummy);
|
||||
} else if (list_next(&head, &dummy))
|
||||
assert(list_next(&head, &dummy)->val > j);
|
||||
list_del(&head, &dummy);
|
||||
assert(list_del(&head, &dummy) != NULL);
|
||||
}
|
||||
ts_hash("add-dup+find_{lt,gteq}", "a538546a6e6ab0484e925940aa8dd02fd934408bbaed8cb66a0721841584d838");
|
||||
#endif
|
||||
@ -295,7 +295,7 @@ static void concat(test_, TYPE)(void)
|
||||
(void)prng_rand(prng);
|
||||
j = prng_rand(prng) % NITEM;
|
||||
if (itm[j].scratchpad == 1) {
|
||||
list_del(&head, &itm[j]);
|
||||
assert(list_del(&head, &itm[j]) != NULL);
|
||||
itm[j].scratchpad = 0;
|
||||
l++;
|
||||
}
|
||||
@ -307,7 +307,7 @@ static void concat(test_, TYPE)(void)
|
||||
assert(item->scratchpad != 0);
|
||||
|
||||
if (item->val & 1) {
|
||||
list_del(&head, item);
|
||||
assert(list_del(&head, item) != NULL);
|
||||
item->scratchpad = 0;
|
||||
l++;
|
||||
}
|
||||
@ -333,7 +333,7 @@ static void concat(test_, TYPE)(void)
|
||||
for (i = 0; i < NITEM / 2; i++) {
|
||||
j = prng_rand(prng) % NITEM;
|
||||
if (itm[j].scratchpad == 1) {
|
||||
list_del(&head, &itm[j]);
|
||||
assert(list_del(&head, &itm[j]) != NULL);
|
||||
itm[j].scratchpad = 0;
|
||||
k--;
|
||||
}
|
||||
@ -371,7 +371,7 @@ static void concat(test_, TYPE)(void)
|
||||
for (i = 0; i < NITEM / 2; i++) {
|
||||
j = prng_rand(prng) % NITEM;
|
||||
if (itm[j].scratchpad == 1) {
|
||||
list_del(&head, &itm[j]);
|
||||
assert(list_del(&head, &itm[j]) != NULL);
|
||||
itm[j].scratchpad = 0;
|
||||
k--;
|
||||
}
|
||||
@ -424,7 +424,7 @@ static void concat(test_, TYPE)(void)
|
||||
item = &itm[j];
|
||||
if (item->scratchpad == 0)
|
||||
continue;
|
||||
list_del(&head, item);
|
||||
assert(list_del(&head, item) != NULL);
|
||||
}
|
||||
item->scratchpad = 0;
|
||||
k--;
|
||||
@ -469,7 +469,7 @@ static void concat(test_, TYPE)(void)
|
||||
item = &itm[j];
|
||||
if (item->scratchpad == 0)
|
||||
continue;
|
||||
list_del(&head, item);
|
||||
assert(list_del(&head, item) != NULL);
|
||||
}
|
||||
item->scratchpad = 0;
|
||||
k--;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user