niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

perf tools: Stop using 'self' in strlist

Browse source 
As suggested by tglx, 'self' should be replaced by something that is
more useful.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-933537sxtcz47qs0e0ledmrp@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2013-01-24 21:59:59 -03:00
parent e23c1a5578
commit d8639f068a
2 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
tools/perf/util/strlist.c
View file

@ -35,11 +35,11 @@ out_delete:
return NULL; return NULL;
} }
static void str_node__delete(struct str_node *self, bool dupstr) static void str_node__delete(struct str_node *snode, bool dupstr)
{ {
if (dupstr) if (dupstr)
free((void *)self->s); free((void *)snode->s);
free(self); free(snode);
} }
static static
@ -59,12 +59,12 @@ static int strlist__node_cmp(struct rb_node *rb_node, const void *entry)
return strcmp(snode->s, str); return strcmp(snode->s, str);
} }
int strlist__add(struct strlist *self, const char *new_entry) int strlist__add(struct strlist *slist, const char *new_entry)
{ {
return rblist__add_node(&self->rblist, new_entry); return rblist__add_node(&slist->rblist, new_entry);
} }
int strlist__load(struct strlist *self, const char *filename) int strlist__load(struct strlist *slist, const char *filename)
{ {
char entry[1024]; char entry[1024];
int err; int err;
@ -80,7 +80,7 @@ int strlist__load(struct strlist *self, const char *filename)
continue; continue;
entry[len - 1] = '\0'; entry[len - 1] = '\0';
err = strlist__add(self, entry); err = strlist__add(slist, entry);
if (err != 0) if (err != 0)
goto out; goto out;
} }
@ -107,56 +107,56 @@ struct str_node *strlist__find(struct strlist *slist, const char *entry)
return snode; return snode;
} }
static int strlist__parse_list_entry(struct strlist *self, const char *s) static int strlist__parse_list_entry(struct strlist *slist, const char *s)
{ {
if (strncmp(s, "file://", 7) == 0) if (strncmp(s, "file://", 7) == 0)
return strlist__load(self, s + 7); return strlist__load(slist, s + 7);
return strlist__add(self, s); return strlist__add(slist, s);
} }
int strlist__parse_list(struct strlist *self, const char *s) int strlist__parse_list(struct strlist *slist, const char *s)
{ {
char *sep; char *sep;
int err; int err;
while ((sep = strchr(s, ',')) != NULL) { while ((sep = strchr(s, ',')) != NULL) {
*sep = '\0'; *sep = '\0';
err = strlist__parse_list_entry(self, s); err = strlist__parse_list_entry(slist, s);
*sep = ','; *sep = ',';
if (err != 0) if (err != 0)
return err; return err;
s = sep + 1; s = sep + 1;
} }
return *s ? strlist__parse_list_entry(self, s) : 0; return *s ? strlist__parse_list_entry(slist, s) : 0;
} }
struct strlist *strlist__new(bool dupstr, const char *slist) struct strlist *strlist__new(bool dupstr, const char *list)
{ {
struct strlist *self = malloc(sizeof(*self)); struct strlist *slist = malloc(sizeof(*slist));
if (self != NULL) { if (slist != NULL) {
rblist__init(&self->rblist); rblist__init(&slist->rblist);
self->rblist.node_cmp = strlist__node_cmp; slist->rblist.node_cmp = strlist__node_cmp;
self->rblist.node_new = strlist__node_new; slist->rblist.node_new = strlist__node_new;
self->rblist.node_delete = strlist__node_delete; slist->rblist.node_delete = strlist__node_delete;
self->dupstr = dupstr; slist->dupstr = dupstr;
if (slist && strlist__parse_list(self, slist) != 0) if (slist && strlist__parse_list(slist, list) != 0)
goto out_error; goto out_error;
} }
return self; return slist;
out_error: out_error:
free(self); free(slist);
return NULL; return NULL;
} }
void strlist__delete(struct strlist *self) void strlist__delete(struct strlist *slist)
{ {
if (self != NULL) if (slist != NULL)
rblist__delete(&self->rblist); rblist__delete(&slist->rblist);
} }
struct str_node *strlist__entry(const struct strlist *slist, unsigned int idx) struct str_node *strlist__entry(const struct strlist *slist, unsigned int idx)

42
tools/perf/util/strlist.h
View file

@ -17,34 +17,34 @@ struct strlist {
}; };
struct strlist *strlist__new(bool dupstr, const char *slist); struct strlist *strlist__new(bool dupstr, const char *slist);
void strlist__delete(struct strlist *self); void strlist__delete(struct strlist *slist);
void strlist__remove(struct strlist *self, struct str_node *sn); void strlist__remove(struct strlist *slist, struct str_node *sn);
int strlist__load(struct strlist *self, const char *filename); int strlist__load(struct strlist *slist, const char *filename);
int strlist__add(struct strlist *self, const char *str); int strlist__add(struct strlist *slist, const char *str);
struct str_node *strlist__entry(const struct strlist *self, unsigned int idx); struct str_node *strlist__entry(const struct strlist *slist, unsigned int idx);
struct str_node *strlist__find(struct strlist *self, const char *entry); struct str_node *strlist__find(struct strlist *slist, const char *entry);
static inline bool strlist__has_entry(struct strlist *self, const char *entry) static inline bool strlist__has_entry(struct strlist *slist, const char *entry)
{ {
return strlist__find(self, entry) != NULL; return strlist__find(slist, entry) != NULL;
} }
static inline bool strlist__empty(const struct strlist *self) static inline bool strlist__empty(const struct strlist *slist)
{ {
return rblist__empty(&self->rblist); return rblist__empty(&slist->rblist);
} }
static inline unsigned int strlist__nr_entries(const struct strlist *self) static inline unsigned int strlist__nr_entries(const struct strlist *slist)
{ {
return rblist__nr_entries(&self->rblist); return rblist__nr_entries(&slist->rblist);
} }
/* For strlist iteration */ /* For strlist iteration */
static inline struct str_node *strlist__first(struct strlist *self) static inline struct str_node *strlist__first(struct strlist *slist)
{ {
struct rb_node *rn = rb_first(&self->rblist.entries); struct rb_node *rn = rb_first(&slist->rblist.entries);
return rn ? rb_entry(rn, struct str_node, rb_node) : NULL; return rn ? rb_entry(rn, struct str_node, rb_node) : NULL;
} }
static inline struct str_node *strlist__next(struct str_node *sn) static inline struct str_node *strlist__next(struct str_node *sn)
@ -59,21 +59,21 @@ static inline struct str_node *strlist__next(struct str_node *sn)
/** /**
* strlist_for_each - iterate over a strlist * strlist_for_each - iterate over a strlist
* @pos: the &struct str_node to use as a loop cursor. * @pos: the &struct str_node to use as a loop cursor.
* @self: the &struct strlist for loop. * @slist: the &struct strlist for loop.
*/ */
#define strlist__for_each(pos, self) \ #define strlist__for_each(pos, slist) \
for (pos = strlist__first(self); pos; pos = strlist__next(pos)) for (pos = strlist__first(slist); pos; pos = strlist__next(pos))
/** /**
* strlist_for_each_safe - iterate over a strlist safe against removal of * strlist_for_each_safe - iterate over a strlist safe against removal of
* str_node * str_node
* @pos: the &struct str_node to use as a loop cursor. * @pos: the &struct str_node to use as a loop cursor.
* @n: another &struct str_node to use as temporary storage. * @n: another &struct str_node to use as temporary storage.
* @self: the &struct strlist for loop. * @slist: the &struct strlist for loop.
*/ */
#define strlist__for_each_safe(pos, n, self) \ #define strlist__for_each_safe(pos, n, slist) \
for (pos = strlist__first(self), n = strlist__next(pos); pos;\ for (pos = strlist__first(slist), n = strlist__next(pos); pos;\
pos = n, n = strlist__next(n)) pos = n, n = strlist__next(n))
int strlist__parse_list(struct strlist *self, const char *s); int strlist__parse_list(struct strlist *slist, const char *s);
#endif /* __PERF_STRLIST_H */ #endif /* __PERF_STRLIST_H */