Commit 37bbd3ff authored by David Ahern's avatar David Ahern Committed by Arnaldo Carvalho de Melo

perf tools: Introducing rblist

rblist is the rbtree based code from strlist. It will be the common code
for strlist and the to-be-introduced intlist.
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1343709095-7089-2-git-send-email-dsahern@gmail.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 347ed990
...@@ -319,6 +319,7 @@ LIB_H += $(ARCH_INCLUDE) ...@@ -319,6 +319,7 @@ LIB_H += $(ARCH_INCLUDE)
LIB_H += util/cgroup.h LIB_H += util/cgroup.h
LIB_H += $(TRACE_EVENT_DIR)event-parse.h LIB_H += $(TRACE_EVENT_DIR)event-parse.h
LIB_H += util/target.h LIB_H += util/target.h
LIB_H += util/rblist.h
LIB_OBJS += $(OUTPUT)util/abspath.o LIB_OBJS += $(OUTPUT)util/abspath.o
LIB_OBJS += $(OUTPUT)util/alias.o LIB_OBJS += $(OUTPUT)util/alias.o
...@@ -383,6 +384,7 @@ LIB_OBJS += $(OUTPUT)util/xyarray.o ...@@ -383,6 +384,7 @@ LIB_OBJS += $(OUTPUT)util/xyarray.o
LIB_OBJS += $(OUTPUT)util/cpumap.o LIB_OBJS += $(OUTPUT)util/cpumap.o
LIB_OBJS += $(OUTPUT)util/cgroup.o LIB_OBJS += $(OUTPUT)util/cgroup.o
LIB_OBJS += $(OUTPUT)util/target.o LIB_OBJS += $(OUTPUT)util/target.o
LIB_OBJS += $(OUTPUT)util/rblist.o
BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o
......
/*
* Based on strlist.c by:
* (c) 2009 Arnaldo Carvalho de Melo <acme@redhat.com>
*
* Licensed under the GPLv2.
*/
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include "rblist.h"
int rblist__add_node(struct rblist *rblist, const void *new_entry)
{
struct rb_node **p = &rblist->entries.rb_node;
struct rb_node *parent = NULL, *new_node;
while (*p != NULL) {
int rc;
parent = *p;
rc = rblist->node_cmp(parent, new_entry);
if (rc > 0)
p = &(*p)->rb_left;
else if (rc < 0)
p = &(*p)->rb_right;
else
return -EEXIST;
}
new_node = rblist->node_new(rblist, new_entry);
if (new_node == NULL)
return -ENOMEM;
rb_link_node(new_node, parent, p);
rb_insert_color(new_node, &rblist->entries);
++rblist->nr_entries;
return 0;
}
void rblist__remove_node(struct rblist *rblist, struct rb_node *rb_node)
{
rb_erase(rb_node, &rblist->entries);
rblist->node_delete(rblist, rb_node);
}
struct rb_node *rblist__find(struct rblist *rblist, const void *entry)
{
struct rb_node **p = &rblist->entries.rb_node;
struct rb_node *parent = NULL;
while (*p != NULL) {
int rc;
parent = *p;
rc = rblist->node_cmp(parent, entry);
if (rc > 0)
p = &(*p)->rb_left;
else if (rc < 0)
p = &(*p)->rb_right;
else
return parent;
}
return NULL;
}
void rblist__init(struct rblist *rblist)
{
if (rblist != NULL) {
rblist->entries = RB_ROOT;
rblist->nr_entries = 0;
}
return;
}
void rblist__delete(struct rblist *rblist)
{
if (rblist != NULL) {
struct rb_node *pos, *next = rb_first(&rblist->entries);
while (next) {
pos = next;
next = rb_next(pos);
rb_erase(pos, &rblist->entries);
rblist->node_delete(rblist, pos);
}
free(rblist);
}
}
struct rb_node *rblist__entry(const struct rblist *rblist, unsigned int idx)
{
struct rb_node *node;
for (node = rb_first(&rblist->entries); node; node = rb_next(node)) {
if (!idx--)
return node;
}
return NULL;
}
#ifndef __PERF_RBLIST_H
#define __PERF_RBLIST_H
#include <linux/rbtree.h>
#include <stdbool.h>
/*
* create node structs of the form:
* struct my_node {
* struct rb_node rb_node;
* ... my data ...
* };
*
* create list structs of the form:
* struct mylist {
* struct rblist rblist;
* ... my data ...
* };
*/
struct rblist {
struct rb_root entries;
unsigned int nr_entries;
int (*node_cmp)(struct rb_node *rbn, const void *entry);
struct rb_node *(*node_new)(struct rblist *rlist, const void *new_entry);
void (*node_delete)(struct rblist *rblist, struct rb_node *rb_node);
};
void rblist__init(struct rblist *rblist);
void rblist__delete(struct rblist *rblist);
int rblist__add_node(struct rblist *rblist, const void *new_entry);
void rblist__remove_node(struct rblist *rblist, struct rb_node *rb_node);
struct rb_node *rblist__find(struct rblist *rblist, const void *entry);
struct rb_node *rblist__entry(const struct rblist *rblist, unsigned int idx);
static inline bool rblist__empty(const struct rblist *rblist)
{
return rblist->nr_entries == 0;
}
static inline unsigned int rblist__nr_entries(const struct rblist *rblist)
{
return rblist->nr_entries;
}
#endif /* __PERF_RBLIST_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment