Skip to content

Commit

Permalink
perf probe: Use wrapper functions
Browse files Browse the repository at this point in the history 
Use wrapped functions as much as possible, to check out of
memory conditions in perf probe.

Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: systemtap <systemtap@sources.redhat.com>
Cc: DLE <dle-develop@lists.sourceforge.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20100316220530.32050.53951.stgit@localhost6.localdomain6>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Masami Hiramatsu authored and Ingo Molnar committed Mar 17, 2010
1 parent a1d37d5 commit 31facc5
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 40 deletions.
4 changes: 1 addition & 3 deletions tools/perf/builtin-probe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,7 @@ static void parse_probe_event_argv(int argc, const char **argv)
len = 0;
for (i = 0; i < argc; i++)
len += strlen(argv[i]) + 1;
buf = zalloc(len + 1);
if (!buf)
die("Failed to allocate memory for binding arguments.");
buf = xzalloc(len + 1);
len = 0;
for (i = 0; i < argc; i++)
len += sprintf(&buf[len], "%s ", argv[i]);
Expand Down
46 changes: 17 additions & 29 deletions tools/perf/util/probe-event.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <limits.h>

#undef _GNU_SOURCE
#include "util.h"
#include "event.h"
#include "string.h"
#include "strlist.h"
Expand Down Expand Up @@ -90,9 +91,9 @@ void parse_line_range_desc(const char *arg, struct line_range *lr)
if (*tmp != '\0')
semantic_error("Tailing with invalid character '%d'.",
*tmp);
tmp = strndup(arg, (ptr - arg));
tmp = xstrndup(arg, (ptr - arg));
} else
tmp = strdup(arg);
tmp = xstrdup(arg);

if (strchr(tmp, '.'))
lr->file = tmp;
Expand Down Expand Up @@ -135,7 +136,7 @@ static void parse_perf_probe_probepoint(char *arg, struct probe_point *pp)
if (!check_event_name(arg))
semantic_error("%s is bad for event name -it must "
"follow C symbol-naming rule.", arg);
pp->event = strdup(arg);
pp->event = xstrdup(arg);
arg = tmp;
}

Expand All @@ -147,17 +148,16 @@ static void parse_perf_probe_probepoint(char *arg, struct probe_point *pp)

/* Check arg is function or file and copy it */
if (strchr(arg, '.')) /* File */
pp->file = strdup(arg);
pp->file = xstrdup(arg);
else /* Function */
pp->function = strdup(arg);
DIE_IF(pp->file == NULL && pp->function == NULL);
pp->function = xstrdup(arg);

/* Parse other options */
while (ptr) {
arg = ptr;
c = nc;
if (c == ';') { /* Lazy pattern must be the last part */
pp->lazy_line = strdup(arg);
pp->lazy_line = xstrdup(arg);
break;
}
ptr = strpbrk(arg, ";:+@%");
Expand All @@ -181,8 +181,7 @@ static void parse_perf_probe_probepoint(char *arg, struct probe_point *pp)
case '@': /* File name */
if (pp->file)
semantic_error("SRC@SRC is not allowed.");
pp->file = strdup(arg);
DIE_IF(pp->file == NULL);
pp->file = xstrdup(arg);
break;
case '%': /* Probe places */
if (strcmp(arg, "return") == 0) {
Expand Down Expand Up @@ -247,11 +246,9 @@ void parse_perf_probe_event(const char *str, struct probe_point *pp,

/* Copy arguments and ensure return probe has no C argument */
pp->nr_args = argc - 1;
pp->args = zalloc(sizeof(char *) * pp->nr_args);
pp->args = xzalloc(sizeof(char *) * pp->nr_args);
for (i = 0; i < pp->nr_args; i++) {
pp->args[i] = strdup(argv[i + 1]);
if (!pp->args[i])
die("Failed to copy argument.");
pp->args[i] = xstrdup(argv[i + 1]);
if (is_c_varname(pp->args[i])) {
if (pp->retprobe)
semantic_error("You can't specify local"
Expand Down Expand Up @@ -299,14 +296,12 @@ void parse_trace_kprobe_event(const char *str, struct probe_point *pp)
pp->file = NULL;

pp->nr_args = argc - 2;
pp->args = zalloc(sizeof(char *) * pp->nr_args);
pp->args = xzalloc(sizeof(char *) * pp->nr_args);
for (i = 0; i < pp->nr_args; i++) {
p = strchr(argv[i + 2], '=');
if (p) /* We don't need which register is assigned. */
*p = '\0';
pp->args[i] = strdup(argv[i + 2]);
if (!pp->args[i])
die("Failed to copy argument.");
pp->args[i] = xstrdup(argv[i + 2]);
}

argv_free(argv);
Expand All @@ -319,10 +314,8 @@ int synthesize_perf_probe_point(struct probe_point *pp)
char offs[64] = "", line[64] = "";
int ret;

pp->probes[0] = buf = zalloc(MAX_CMDLEN);
pp->probes[0] = buf = xzalloc(MAX_CMDLEN);
pp->found = 1;
if (!buf)
die("Failed to allocate memory by zalloc.");
if (pp->offset) {
ret = e_snprintf(offs, 64, "+%d", pp->offset);
if (ret <= 0)
Expand Down Expand Up @@ -380,9 +373,7 @@ int synthesize_trace_kprobe_event(struct probe_point *pp)
char *buf;
int i, len, ret;

pp->probes[0] = buf = zalloc(MAX_CMDLEN);
if (!buf)
die("Failed to allocate memory by zalloc.");
pp->probes[0] = buf = xzalloc(MAX_CMDLEN);
ret = e_snprintf(buf, MAX_CMDLEN, "%s+%d", pp->function, pp->offset);
if (ret <= 0)
goto error;
Expand Down Expand Up @@ -612,10 +603,9 @@ void add_trace_kprobe_events(struct probe_point *probes, int nr_probes,
for (j = 0; j < nr_probes; j++) {
pp = probes + j;
if (!pp->event)
pp->event = strdup(pp->function);
pp->event = xstrdup(pp->function);
if (!pp->group)
pp->group = strdup(PERFPROBE_GROUP);
DIE_IF(!pp->event || !pp->group);
pp->group = xstrdup(PERFPROBE_GROUP);
/* If force_add is true, suffix search is allowed */
allow_suffix = force_add;
for (i = 0; i < pp->found; i++) {
Expand Down Expand Up @@ -709,9 +699,7 @@ void del_trace_kprobe_events(struct strlist *dellist)
namelist = get_perf_event_names(fd, true);

strlist__for_each(ent, dellist) {
str = strdup(ent->s);
if (!str)
die("Failed to copy event.");
str = xstrdup(ent->s);
pr_debug("Parsing: %s\n", str);
p = strchr(str, ':');
if (p) {
Expand Down
14 changes: 6 additions & 8 deletions tools/perf/util/probe-finder.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ static void line_list__add_line(struct list_head *head, unsigned int line)
p = head;
found:
pr_debug("line list: add a line %u\n", line);
ln = zalloc(sizeof(struct line_node));
DIE_IF(ln == NULL);
ln = xzalloc(sizeof(struct line_node));
ln->line = line;
INIT_LIST_HEAD(&ln->list);
list_add(&ln->list, p);
Expand Down Expand Up @@ -416,7 +415,7 @@ static void show_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf)
(unsigned long)(pf->addr - eaddr));
/* Copy the function name if possible */
if (!pp->function) {
pp->function = strdup(name);
pp->function = xstrdup(name);
pp->offset = (size_t)(pf->addr - eaddr);
}
} else {
Expand All @@ -425,7 +424,7 @@ static void show_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf)
(uintmax_t)pf->addr);
if (!pp->function) {
/* TODO: Use _stext */
pp->function = strdup("");
pp->function = xstrdup("");
pp->offset = (size_t)pf->addr;
}
}
Expand Down Expand Up @@ -456,7 +455,7 @@ static void show_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf)
if (pp->found == MAX_PROBES)
die("Too many( > %d) probe point found.\n", MAX_PROBES);

pp->probes[pp->found] = strdup(tmp);
pp->probes[pp->found] = xstrdup(tmp);
pp->found++;
}

Expand Down Expand Up @@ -506,8 +505,7 @@ static int find_lazy_match_lines(struct list_head *head,
if (fd < 0)
die("failed to open %s", fname);
DIE_IF(fstat(fd, &st) < 0);
fbuf = malloc(st.st_size + 2);
DIE_IF(fbuf == NULL);
fbuf = xmalloc(st.st_size + 2);
DIE_IF(read(fd, fbuf, st.st_size) < 0);
close(fd);
fbuf[st.st_size] = '\n'; /* Dummy line */
Expand Down Expand Up @@ -727,7 +725,7 @@ static void find_line_range_by_line(Dwarf_Die *sp_die, struct line_finder *lf)

/* Copy real path */
if (!lf->lr->path)
lf->lr->path = strdup(src);
lf->lr->path = xstrdup(src);
line_list__add_line(&lf->lr->line_list, (unsigned int)lineno);
}
/* Update status */
Expand Down

0 comments on commit 31facc5

Please sign in to comment.