radix tree test suite: Fix leaky tests
If item_insert() or item_insert_order() failed to insert an item, they would leak the item they had just created. This was causing runaway memory consumption while running the iteration_check testcase, which proves that Ross has too much memory in his workstation ;-) Make sure to free the item on error. Found with -fsanitize=address. Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com> Reviewed-by: Rehas Sachdeva <aquannie@gmail.com>
This commit is contained in:
Родитель
829f83d365
Коммит
18d0c57394
|
@ -29,15 +29,28 @@ int __item_insert(struct radix_tree_root *root, struct item *item)
|
||||||
return __radix_tree_insert(root, item->index, item->order, item);
|
return __radix_tree_insert(root, item->index, item->order, item);
|
||||||
}
|
}
|
||||||
|
|
||||||
int item_insert(struct radix_tree_root *root, unsigned long index)
|
struct item *item_create(unsigned long index, unsigned int order)
|
||||||
{
|
{
|
||||||
return __item_insert(root, item_create(index, 0));
|
struct item *ret = malloc(sizeof(*ret));
|
||||||
|
|
||||||
|
ret->index = index;
|
||||||
|
ret->order = order;
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int item_insert_order(struct radix_tree_root *root, unsigned long index,
|
int item_insert_order(struct radix_tree_root *root, unsigned long index,
|
||||||
unsigned order)
|
unsigned order)
|
||||||
{
|
{
|
||||||
return __item_insert(root, item_create(index, order));
|
struct item *item = item_create(index, order);
|
||||||
|
int err = __item_insert(root, item);
|
||||||
|
if (err)
|
||||||
|
free(item);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
int item_insert(struct radix_tree_root *root, unsigned long index)
|
||||||
|
{
|
||||||
|
return item_insert_order(root, index, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void item_sanity(struct item *item, unsigned long index)
|
void item_sanity(struct item *item, unsigned long index)
|
||||||
|
@ -61,15 +74,6 @@ int item_delete(struct radix_tree_root *root, unsigned long index)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct item *item_create(unsigned long index, unsigned int order)
|
|
||||||
{
|
|
||||||
struct item *ret = malloc(sizeof(*ret));
|
|
||||||
|
|
||||||
ret->index = index;
|
|
||||||
ret->order = order;
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
void item_check_present(struct radix_tree_root *root, unsigned long index)
|
void item_check_present(struct radix_tree_root *root, unsigned long index)
|
||||||
{
|
{
|
||||||
struct item *item;
|
struct item *item;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче