mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 22:54:01 +00:00
46cb25b1a0
Inac12f6764c("perf tools: Implement branch_type event parameter") we started using the parse_branch_str() function from one of the files used in the python binding, which caused this entry in 'perf test' to fail: # perf test -v python 16: Try 'import perf' in python, checking link problems : --- start --- test child forked, pid 16667 Traceback (most recent call last): File "<stdin>", line 1, in <module> ImportError: /tmp/build/perf/python/perf.so: undefined symbol: parse_branch_str test child finished with -1 ---- end ---- Try 'import perf' in python, checking link problems: FAILED! # I must've commited some mistake when running 'perf test' to send the pull request for the perf-core-for-mingo-20161024 tag, to have let this regression to pass, sigh. Just add tools/perf/util/parse-branch-options.c and switch from using ui__warning(), that is not available in the python binding, use pr_warning() instead, which is good enough for this case. Now: # perf test python 16: Try 'import perf' in python, checking link problems : Ok # Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Cc: Andi Kleen <ak@linux.intel.com> Fixes:ac12f6764c("perf tools: Implement branch_type event parameter") Link: http://lkml.kernel.org/n/tip-9kn1ct1cx9ppwqlmzl6z0xhs@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
104 lines
2.1 KiB
C
104 lines
2.1 KiB
C
#include "perf.h"
|
|
#include "util/util.h"
|
|
#include "util/debug.h"
|
|
#include <subcmd/parse-options.h>
|
|
#include "util/parse-branch-options.h"
|
|
|
|
#define BRANCH_OPT(n, m) \
|
|
{ .name = n, .mode = (m) }
|
|
|
|
#define BRANCH_END { .name = NULL }
|
|
|
|
struct branch_mode {
|
|
const char *name;
|
|
int mode;
|
|
};
|
|
|
|
static const struct branch_mode branch_modes[] = {
|
|
BRANCH_OPT("u", PERF_SAMPLE_BRANCH_USER),
|
|
BRANCH_OPT("k", PERF_SAMPLE_BRANCH_KERNEL),
|
|
BRANCH_OPT("hv", PERF_SAMPLE_BRANCH_HV),
|
|
BRANCH_OPT("any", PERF_SAMPLE_BRANCH_ANY),
|
|
BRANCH_OPT("any_call", PERF_SAMPLE_BRANCH_ANY_CALL),
|
|
BRANCH_OPT("any_ret", PERF_SAMPLE_BRANCH_ANY_RETURN),
|
|
BRANCH_OPT("ind_call", PERF_SAMPLE_BRANCH_IND_CALL),
|
|
BRANCH_OPT("abort_tx", PERF_SAMPLE_BRANCH_ABORT_TX),
|
|
BRANCH_OPT("in_tx", PERF_SAMPLE_BRANCH_IN_TX),
|
|
BRANCH_OPT("no_tx", PERF_SAMPLE_BRANCH_NO_TX),
|
|
BRANCH_OPT("cond", PERF_SAMPLE_BRANCH_COND),
|
|
BRANCH_OPT("ind_jmp", PERF_SAMPLE_BRANCH_IND_JUMP),
|
|
BRANCH_OPT("call", PERF_SAMPLE_BRANCH_CALL),
|
|
BRANCH_END
|
|
};
|
|
|
|
int parse_branch_str(const char *str, __u64 *mode)
|
|
{
|
|
#define ONLY_PLM \
|
|
(PERF_SAMPLE_BRANCH_USER |\
|
|
PERF_SAMPLE_BRANCH_KERNEL |\
|
|
PERF_SAMPLE_BRANCH_HV)
|
|
|
|
int ret = 0;
|
|
char *p, *s;
|
|
char *os = NULL;
|
|
const struct branch_mode *br;
|
|
|
|
if (str == NULL) {
|
|
*mode = PERF_SAMPLE_BRANCH_ANY;
|
|
return 0;
|
|
}
|
|
|
|
/* because str is read-only */
|
|
s = os = strdup(str);
|
|
if (!s)
|
|
return -1;
|
|
|
|
for (;;) {
|
|
p = strchr(s, ',');
|
|
if (p)
|
|
*p = '\0';
|
|
|
|
for (br = branch_modes; br->name; br++) {
|
|
if (!strcasecmp(s, br->name))
|
|
break;
|
|
}
|
|
if (!br->name) {
|
|
ret = -1;
|
|
pr_warning("unknown branch filter %s,"
|
|
" check man page\n", s);
|
|
goto error;
|
|
}
|
|
|
|
*mode |= br->mode;
|
|
|
|
if (!p)
|
|
break;
|
|
|
|
s = p + 1;
|
|
}
|
|
|
|
/* default to any branch */
|
|
if ((*mode & ~ONLY_PLM) == 0) {
|
|
*mode = PERF_SAMPLE_BRANCH_ANY;
|
|
}
|
|
error:
|
|
free(os);
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
parse_branch_stack(const struct option *opt, const char *str, int unset)
|
|
{
|
|
__u64 *mode = (__u64 *)opt->value;
|
|
|
|
if (unset)
|
|
return 0;
|
|
|
|
/*
|
|
* cannot set it twice, -b + --branch-filter for instance
|
|
*/
|
|
if (*mode)
|
|
return -1;
|
|
|
|
return parse_branch_str(str, mode);
|
|
}
|