Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

[mv-sheeva.git] / tools / perf / util / strlist.h

diff --git a/tools/perf/util/strlist.h b/tools/perf/util/strlist.h
index cb4659306d7bd02221091716e6cc4151d560d1ef..3ba839007d2c975c49e4f3f286e9d64eff3d3f60 100644 (file)
--- a/tools/perf/util/strlist.h
+++ b/tools/perf/util/strlist.h
@@ -23,7 +23,12 @@ int strlist__load(struct strlist *self, const char *filename);
 int strlist__add(struct strlist *self, const char *str);
 
 struct str_node *strlist__entry(const struct strlist *self, unsigned int idx);
-bool strlist__has_entry(struct strlist *self, const char *entry);
+struct str_node *strlist__find(struct strlist *self, const char *entry);
+
+static inline bool strlist__has_entry(struct strlist *self, const char *entry)
+{
+       return strlist__find(self, entry) != NULL;
+}
 
 static inline bool strlist__empty(const struct strlist *self)
 {
@@ -35,5 +40,39 @@ static inline unsigned int strlist__nr_entries(const struct strlist *self)
        return self->nr_entries;
 }
 
+/* For strlist iteration */
+static inline struct str_node *strlist__first(struct strlist *self)
+{
+       struct rb_node *rn = rb_first(&self->entries);
+       return rn ? rb_entry(rn, struct str_node, rb_node) : NULL;
+}
+static inline struct str_node *strlist__next(struct str_node *sn)
+{
+       struct rb_node *rn;
+       if (!sn)
+               return NULL;
+       rn = rb_next(&sn->rb_node);
+       return rn ? rb_entry(rn, struct str_node, rb_node) : NULL;
+}
+
+/**
+ * strlist_for_each      - iterate over a strlist
+ * @pos:       the &struct str_node to use as a loop cursor.
+ * @self:      the &struct strlist for loop.
+ */
+#define strlist__for_each(pos, self)   \
+       for (pos = strlist__first(self); pos; pos = strlist__next(pos))
+
+/**
+ * strlist_for_each_safe - iterate over a strlist safe against removal of
+ *                         str_node
+ * @pos:       the &struct str_node to use as a loop cursor.
+ * @n:         another &struct str_node to use as temporary storage.
+ * @self:      the &struct strlist for loop.
+ */
+#define strlist__for_each_safe(pos, n, self)   \
+       for (pos = strlist__first(self), n = strlist__next(pos); pos;\
+            pos = n, n = strlist__next(n))
+
 int strlist__parse_list(struct strlist *self, const char *s);
 #endif /* __PERF_STRLIST_H */