Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 813335b8 authored by David Ahern's avatar David Ahern Committed by Arnaldo Carvalho de Melo
Browse files

perf util: Add findnew method to intlist 



Similar to other findnew based methods if the requested object is not
found, add it to the list.

v2: followed format of other findnew methods per acme's request

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.kim@lge.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1381289214-24885-2-git-send-email-dsahern@gmail.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 87f91868

tools/perf/util/intlist.c

+18 −4
Original line number Diff line number Diff line
@@ -58,22 +58,36 @@ 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)

static struct int_node *__intlist__findnew(struct intlist *ilist,

					   int i, bool create)

{

	struct int_node *node;

	struct int_node *node = NULL;

	struct rb_node *rb_node;



	if (ilist == NULL)

		return NULL;



	node = NULL;

	if (create)

		rb_node = rblist__findnew(&ilist->rblist, (void *)((long)i));

	else

		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 int_node *intlist__find(struct intlist *ilist, int i)

{

	return __intlist__findnew(ilist, i, false);

}



struct int_node *intlist__findnew(struct intlist *ilist, int i)

{

	return __intlist__findnew(ilist, i, true);

}



static int intlist__parse_list(struct intlist *ilist, const char *s)

{

	char *sep;

tools/perf/util/intlist.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ int intlist__add(struct intlist *ilist, int i); 


struct int_node *intlist__entry(const struct intlist *ilist, unsigned int idx);

struct int_node *intlist__find(struct intlist *ilist, int i);

struct int_node *intlist__findnew(struct intlist *ilist, int i);



static inline bool intlist__has_entry(struct intlist *ilist, int i)

{

tools/perf/util/rblist.c

+24 −3
Original line number Diff line number Diff line
@@ -48,10 +48,12 @@ void rblist__remove_node(struct rblist *rblist, struct rb_node *rb_node) 
	rblist->node_delete(rblist, rb_node);

}



struct rb_node *rblist__find(struct rblist *rblist, const void *entry)

static struct rb_node *__rblist__findnew(struct rblist *rblist,

					 const void *entry,

					 bool create)

{

	struct rb_node **p = &rblist->entries.rb_node;

	struct rb_node *parent = NULL;

	struct rb_node *parent = NULL, *new_node = NULL;



	while (*p != NULL) {

		int rc;
@@ -67,7 +69,26 @@ struct rb_node *rblist__find(struct rblist *rblist, const void *entry) 
			return parent;

	}



	return NULL;

	if (create) {

		new_node = rblist->node_new(rblist, entry);

		if (new_node) {

			rb_link_node(new_node, parent, p);

			rb_insert_color(new_node, &rblist->entries);

			++rblist->nr_entries;

		}

	}



	return new_node;

}



struct rb_node *rblist__find(struct rblist *rblist, const void *entry)

{

	return __rblist__findnew(rblist, entry, false);

}



struct rb_node *rblist__findnew(struct rblist *rblist, const void *entry)

{

	return __rblist__findnew(rblist, entry, true);

}



void rblist__init(struct rblist *rblist)

tools/perf/util/rblist.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 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__findnew(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)