Commit bcbd0040 authored by Irina Tirdea's avatar Irina Tirdea Committed by Arnaldo Carvalho de Melo

perf tools: remove sscanf extension %as

perf uses sscanf extension %as to read and allocate a string in the same
step.  This is a non-standard extension only present in new versions of
glibc.

Replacing the use of sscanf and %as with strtok_r calls in order to
parse a given string into its components.  This is needed in Android
since bionic does not support
%as extension for sscanf.
Reviewed-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Tested-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: default avatarIrina Tirdea <irina.tirdea@intel.com>
Acked-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1348173470-4936-1-git-send-email-irina.tirdea@gmail.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 37e9d750
...@@ -1100,6 +1100,7 @@ static int parse_probe_trace_command(const char *cmd, ...@@ -1100,6 +1100,7 @@ static int parse_probe_trace_command(const char *cmd,
struct probe_trace_point *tp = &tev->point; struct probe_trace_point *tp = &tev->point;
char pr; char pr;
char *p; char *p;
char *argv0_str = NULL, *fmt, *fmt1_str, *fmt2_str, *fmt3_str;
int ret, i, argc; int ret, i, argc;
char **argv; char **argv;
...@@ -1116,14 +1117,27 @@ static int parse_probe_trace_command(const char *cmd, ...@@ -1116,14 +1117,27 @@ static int parse_probe_trace_command(const char *cmd,
} }
/* Scan event and group name. */ /* Scan event and group name. */
ret = sscanf(argv[0], "%c:%a[^/ \t]/%a[^ \t]", argv0_str = strdup(argv[0]);
&pr, (float *)(void *)&tev->group, if (argv0_str == NULL) {
(float *)(void *)&tev->event); ret = -ENOMEM;
if (ret != 3) { goto out;
}
fmt1_str = strtok_r(argv0_str, ":", &fmt);
fmt2_str = strtok_r(NULL, "/", &fmt);
fmt3_str = strtok_r(NULL, " \t", &fmt);
if (fmt1_str == NULL || strlen(fmt1_str) != 1 || fmt2_str == NULL
|| fmt3_str == NULL) {
semantic_error("Failed to parse event name: %s\n", argv[0]); semantic_error("Failed to parse event name: %s\n", argv[0]);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
pr = fmt1_str[0];
tev->group = strdup(fmt2_str);
tev->event = strdup(fmt3_str);
if (tev->group == NULL || tev->event == NULL) {
ret = -ENOMEM;
goto out;
}
pr_debug("Group:%s Event:%s probe:%c\n", tev->group, tev->event, pr); pr_debug("Group:%s Event:%s probe:%c\n", tev->group, tev->event, pr);
tp->retprobe = (pr == 'r'); tp->retprobe = (pr == 'r');
...@@ -1135,10 +1149,17 @@ static int parse_probe_trace_command(const char *cmd, ...@@ -1135,10 +1149,17 @@ static int parse_probe_trace_command(const char *cmd,
p++; p++;
} else } else
p = argv[1]; p = argv[1];
ret = sscanf(p, "%a[^+]+%lu", (float *)(void *)&tp->symbol, fmt1_str = strtok_r(p, "+", &fmt);
&tp->offset); tp->symbol = strdup(fmt1_str);
if (ret == 1) if (tp->symbol == NULL) {
ret = -ENOMEM;
goto out;
}
fmt2_str = strtok_r(NULL, "", &fmt);
if (fmt2_str == NULL)
tp->offset = 0; tp->offset = 0;
else
tp->offset = strtoul(fmt2_str, NULL, 10);
tev->nargs = argc - 2; tev->nargs = argc - 2;
tev->args = zalloc(sizeof(struct probe_trace_arg) * tev->nargs); tev->args = zalloc(sizeof(struct probe_trace_arg) * tev->nargs);
...@@ -1162,6 +1183,7 @@ static int parse_probe_trace_command(const char *cmd, ...@@ -1162,6 +1183,7 @@ static int parse_probe_trace_command(const char *cmd,
} }
ret = 0; ret = 0;
out: out:
free(argv0_str);
argv_free(argv); argv_free(argv);
return ret; return ret;
} }
......
...@@ -229,24 +229,22 @@ void parse_proc_kallsyms(struct pevent *pevent, ...@@ -229,24 +229,22 @@ void parse_proc_kallsyms(struct pevent *pevent,
char *next = NULL; char *next = NULL;
char *addr_str; char *addr_str;
char *mod; char *mod;
char ch; char *fmt;
line = strtok_r(file, "\n", &next); line = strtok_r(file, "\n", &next);
while (line) { while (line) {
mod = NULL; mod = NULL;
sscanf(line, "%as %c %as\t[%as", addr_str = strtok_r(line, " ", &fmt);
(float *)(void *)&addr_str, /* workaround gcc warning */
&ch, (float *)(void *)&func, (float *)(void *)&mod);
addr = strtoull(addr_str, NULL, 16); addr = strtoull(addr_str, NULL, 16);
free(addr_str); /* skip character */
strtok_r(NULL, " ", &fmt);
/* truncate the extra ']' */ func = strtok_r(NULL, "\t", &fmt);
mod = strtok_r(NULL, "]", &fmt);
/* truncate the extra '[' */
if (mod) if (mod)
mod[strlen(mod) - 1] = 0; mod = mod + 1;
pevent_register_function(pevent, func, addr, mod); pevent_register_function(pevent, func, addr, mod);
free(func);
free(mod);
line = strtok_r(NULL, "\n", &next); line = strtok_r(NULL, "\n", &next);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment