summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/perf-hooks.c
diff options
context:
space:
mode:
authorWang Nan2016-11-26 08:03:29 +0100
committerArnaldo Carvalho de Melo2016-12-05 19:51:42 +0100
commit8ad85e9e6fdaf996bf3ff60303ea00e696bcdd36 (patch)
treedb08e2b766f375c3037d8dcc39d730c3b58b1dec /tools/perf/util/perf-hooks.c
parenttools build: Fix objtool build with clang (diff)
downloadkernel-qcow2-linux-8ad85e9e6fdaf996bf3ff60303ea00e696bcdd36.tar.gz
kernel-qcow2-linux-8ad85e9e6fdaf996bf3ff60303ea00e696bcdd36.tar.xz
kernel-qcow2-linux-8ad85e9e6fdaf996bf3ff60303ea00e696bcdd36.zip
perf tools: Pass context to perf hook functions
Pass a pointer to perf hook functions so they receive context information during setup. Signed-off-by: Wang Nan <wangnan0@huawei.com> Cc: Alexei Starovoitov <ast@fb.com> Cc: He Kuang <hekuang@huawei.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Joe Stringer <joe@ovn.org> Cc: Zefan Li <lizefan@huawei.com> Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/20161126070354.141764-6-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/perf-hooks.c')
-rw-r--r--tools/perf/util/perf-hooks.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/perf/util/perf-hooks.c b/tools/perf/util/perf-hooks.c
index 4ce88e37dd63..cb368306b12b 100644
--- a/tools/perf/util/perf-hooks.c
+++ b/tools/perf/util/perf-hooks.c
@@ -27,7 +27,7 @@ void perf_hooks__invoke(const struct perf_hook_desc *desc)
*(current_perf_hook->p_hook_func) = NULL;
} else {
current_perf_hook = desc;
- (**desc->p_hook_func)();
+ (**desc->p_hook_func)(desc->hook_ctx);
}
current_perf_hook = NULL;
}
@@ -41,7 +41,9 @@ void perf_hooks__recover(void)
#define PERF_HOOK(name) \
perf_hook_func_t __perf_hook_func_##name = NULL; \
struct perf_hook_desc __perf_hook_desc_##name = \
- {.hook_name = #name, .p_hook_func = &__perf_hook_func_##name};
+ {.hook_name = #name, \
+ .p_hook_func = &__perf_hook_func_##name, \
+ .hook_ctx = NULL};
#include "perf-hooks-list.h"
#undef PERF_HOOK
@@ -54,7 +56,8 @@ static struct perf_hook_desc *perf_hooks[] = {
#undef PERF_HOOK
int perf_hooks__set_hook(const char *hook_name,
- perf_hook_func_t hook_func)
+ perf_hook_func_t hook_func,
+ void *hook_ctx)
{
unsigned int i;
@@ -65,6 +68,7 @@ int perf_hooks__set_hook(const char *hook_name,
if (*(perf_hooks[i]->p_hook_func))
pr_warning("Overwrite existing hook: %s\n", hook_name);
*(perf_hooks[i]->p_hook_func) = hook_func;
+ perf_hooks[i]->hook_ctx = hook_ctx;
return 0;
}
return -ENOENT;