2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 06:34:11 +08:00
linux-next/tools/perf/util/intlist.c
Suzuki K. Poulose 60ebf32876 perf tools: Fix intlist node removal
Similar to the one in :
	https://lkml.org/lkml/2012/8/29/27

Make sure we remove the node from the rblist before we delete the node.
The rblist__remove_node() will invoke rblist->node_delete, which  will
take care of deleting the node with the suitable function provided by
the user.

Signed-off-by: Suzuki K Poulose <suzuki@in.ibm.com>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Suzuki K Poulose <suzuki@in.ibm.com>
Link: http://lkml.kernel.org/r/20120831065840.5167.90318.stgit@suzukikp.in.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2012-09-05 17:35:24 -03:00

102 lines
2.1 KiB
C

/*
* Based on intlist.c by:
* (c) 2009 Arnaldo Carvalho de Melo <acme@redhat.com>
*
* Licensed under the GPLv2.
*/
#include <errno.h>
#include <stdlib.h>
#include <linux/compiler.h>
#include "intlist.h"
static struct rb_node *intlist__node_new(struct rblist *rblist __used,
const void *entry)
{
int i = (int)((long)entry);
struct rb_node *rc = NULL;
struct int_node *node = malloc(sizeof(*node));
if (node != NULL) {
node->i = i;
rc = &node->rb_node;
}
return rc;
}
static void int_node__delete(struct int_node *ilist)
{
free(ilist);
}
static void intlist__node_delete(struct rblist *rblist __used,
struct rb_node *rb_node)
{
struct int_node *node = container_of(rb_node, struct int_node, rb_node);
int_node__delete(node);
}
static int intlist__node_cmp(struct rb_node *rb_node, const void *entry)
{
int i = (int)((long)entry);
struct int_node *node = container_of(rb_node, struct int_node, rb_node);
return node->i - i;
}
int intlist__add(struct intlist *ilist, int i)
{
return rblist__add_node(&ilist->rblist, (void *)((long)i));
}
void intlist__remove(struct intlist *ilist, struct int_node *node)
{
rblist__remove_node(&ilist->rblist, &node->rb_node);
}
struct int_node *intlist__find(struct intlist *ilist, int i)
{
struct int_node *node = NULL;
struct rb_node *rb_node = rblist__find(&ilist->rblist, (void *)((long)i));
if (rb_node)
node = container_of(rb_node, struct int_node, rb_node);
return node;
}
struct intlist *intlist__new(void)
{
struct intlist *ilist = malloc(sizeof(*ilist));
if (ilist != NULL) {
rblist__init(&ilist->rblist);
ilist->rblist.node_cmp = intlist__node_cmp;
ilist->rblist.node_new = intlist__node_new;
ilist->rblist.node_delete = intlist__node_delete;
}
return ilist;
}
void intlist__delete(struct intlist *ilist)
{
if (ilist != NULL)
rblist__delete(&ilist->rblist);
}
struct int_node *intlist__entry(const struct intlist *ilist, unsigned int idx)
{
struct int_node *node = NULL;
struct rb_node *rb_node;
rb_node = rblist__entry(&ilist->rblist, idx);
if (rb_node)
node = container_of(rb_node, struct int_node, rb_node);
return node;
}