mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 02:23:16 +00:00
79146a69c8
Fix segfault in perf probe due to a bug introduced by commit d8639f068
(perf tools: Stop using 'self' in strlist).
Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20130312090217.GC4668@in.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
173 lines
3.5 KiB
C
173 lines
3.5 KiB
C
/*
|
|
* (c) 2009 Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
*
|
|
* Licensed under the GPLv2.
|
|
*/
|
|
|
|
#include "strlist.h"
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
static
|
|
struct rb_node *strlist__node_new(struct rblist *rblist, const void *entry)
|
|
{
|
|
const char *s = entry;
|
|
struct rb_node *rc = NULL;
|
|
struct strlist *strlist = container_of(rblist, struct strlist, rblist);
|
|
struct str_node *snode = malloc(sizeof(*snode));
|
|
|
|
if (snode != NULL) {
|
|
if (strlist->dupstr) {
|
|
s = strdup(s);
|
|
if (s == NULL)
|
|
goto out_delete;
|
|
}
|
|
snode->s = s;
|
|
rc = &snode->rb_node;
|
|
}
|
|
|
|
return rc;
|
|
|
|
out_delete:
|
|
free(snode);
|
|
return NULL;
|
|
}
|
|
|
|
static void str_node__delete(struct str_node *snode, bool dupstr)
|
|
{
|
|
if (dupstr)
|
|
free((void *)snode->s);
|
|
free(snode);
|
|
}
|
|
|
|
static
|
|
void strlist__node_delete(struct rblist *rblist, struct rb_node *rb_node)
|
|
{
|
|
struct strlist *slist = container_of(rblist, struct strlist, rblist);
|
|
struct str_node *snode = container_of(rb_node, struct str_node, rb_node);
|
|
|
|
str_node__delete(snode, slist->dupstr);
|
|
}
|
|
|
|
static int strlist__node_cmp(struct rb_node *rb_node, const void *entry)
|
|
{
|
|
const char *str = entry;
|
|
struct str_node *snode = container_of(rb_node, struct str_node, rb_node);
|
|
|
|
return strcmp(snode->s, str);
|
|
}
|
|
|
|
int strlist__add(struct strlist *slist, const char *new_entry)
|
|
{
|
|
return rblist__add_node(&slist->rblist, new_entry);
|
|
}
|
|
|
|
int strlist__load(struct strlist *slist, const char *filename)
|
|
{
|
|
char entry[1024];
|
|
int err;
|
|
FILE *fp = fopen(filename, "r");
|
|
|
|
if (fp == NULL)
|
|
return errno;
|
|
|
|
while (fgets(entry, sizeof(entry), fp) != NULL) {
|
|
const size_t len = strlen(entry);
|
|
|
|
if (len == 0)
|
|
continue;
|
|
entry[len - 1] = '\0';
|
|
|
|
err = strlist__add(slist, entry);
|
|
if (err != 0)
|
|
goto out;
|
|
}
|
|
|
|
err = 0;
|
|
out:
|
|
fclose(fp);
|
|
return err;
|
|
}
|
|
|
|
void strlist__remove(struct strlist *slist, struct str_node *snode)
|
|
{
|
|
rblist__remove_node(&slist->rblist, &snode->rb_node);
|
|
}
|
|
|
|
struct str_node *strlist__find(struct strlist *slist, const char *entry)
|
|
{
|
|
struct str_node *snode = NULL;
|
|
struct rb_node *rb_node = rblist__find(&slist->rblist, entry);
|
|
|
|
if (rb_node)
|
|
snode = container_of(rb_node, struct str_node, rb_node);
|
|
|
|
return snode;
|
|
}
|
|
|
|
static int strlist__parse_list_entry(struct strlist *slist, const char *s)
|
|
{
|
|
if (strncmp(s, "file://", 7) == 0)
|
|
return strlist__load(slist, s + 7);
|
|
|
|
return strlist__add(slist, s);
|
|
}
|
|
|
|
int strlist__parse_list(struct strlist *slist, const char *s)
|
|
{
|
|
char *sep;
|
|
int err;
|
|
|
|
while ((sep = strchr(s, ',')) != NULL) {
|
|
*sep = '\0';
|
|
err = strlist__parse_list_entry(slist, s);
|
|
*sep = ',';
|
|
if (err != 0)
|
|
return err;
|
|
s = sep + 1;
|
|
}
|
|
|
|
return *s ? strlist__parse_list_entry(slist, s) : 0;
|
|
}
|
|
|
|
struct strlist *strlist__new(bool dupstr, const char *list)
|
|
{
|
|
struct strlist *slist = malloc(sizeof(*slist));
|
|
|
|
if (slist != NULL) {
|
|
rblist__init(&slist->rblist);
|
|
slist->rblist.node_cmp = strlist__node_cmp;
|
|
slist->rblist.node_new = strlist__node_new;
|
|
slist->rblist.node_delete = strlist__node_delete;
|
|
|
|
slist->dupstr = dupstr;
|
|
if (list && strlist__parse_list(slist, list) != 0)
|
|
goto out_error;
|
|
}
|
|
|
|
return slist;
|
|
out_error:
|
|
free(slist);
|
|
return NULL;
|
|
}
|
|
|
|
void strlist__delete(struct strlist *slist)
|
|
{
|
|
if (slist != NULL)
|
|
rblist__delete(&slist->rblist);
|
|
}
|
|
|
|
struct str_node *strlist__entry(const struct strlist *slist, unsigned int idx)
|
|
{
|
|
struct str_node *snode = NULL;
|
|
struct rb_node *rb_node;
|
|
|
|
rb_node = rblist__entry(&slist->rblist, idx);
|
|
if (rb_node)
|
|
snode = container_of(rb_node, struct str_node, rb_node);
|
|
|
|
return snode;
|
|
}
|