Commit 30199137 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)
Browse files

tracing/dynevent: Pass extra arguments to match operation

Pass extra arguments to match operation for checking
exact match. If the event doesn't support exact match,
it will be ignored.

Link: http://lkml.kernel.org/r/156095685930.28024.10405547027475590975.stgit@devnote2

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent cb8e7a8d
...@@ -47,6 +47,7 @@ int dyn_event_release(int argc, char **argv, struct dyn_event_operations *type) ...@@ -47,6 +47,7 @@ int dyn_event_release(int argc, char **argv, struct dyn_event_operations *type)
return -EINVAL; return -EINVAL;
event++; event++;
} }
argc--; argv++;
p = strchr(event, '/'); p = strchr(event, '/');
if (p) { if (p) {
...@@ -61,7 +62,8 @@ int dyn_event_release(int argc, char **argv, struct dyn_event_operations *type) ...@@ -61,7 +62,8 @@ int dyn_event_release(int argc, char **argv, struct dyn_event_operations *type)
for_each_dyn_event_safe(pos, n) { for_each_dyn_event_safe(pos, n) {
if (type && type != pos->ops) if (type && type != pos->ops)
continue; continue;
if (!pos->ops->match(system, event, pos)) if (!pos->ops->match(system, event,
argc, (const char **)argv, pos))
continue; continue;
ret = pos->ops->free(pos); ret = pos->ops->free(pos);
......
...@@ -31,8 +31,9 @@ struct dyn_event; ...@@ -31,8 +31,9 @@ struct dyn_event;
* @is_busy: Check whether given event is busy so that it can not be deleted. * @is_busy: Check whether given event is busy so that it can not be deleted.
* Return true if it is busy, otherwides false. * Return true if it is busy, otherwides false.
* @free: Delete the given event. Return 0 if success, otherwides error. * @free: Delete the given event. Return 0 if success, otherwides error.
* @match: Check whether given event and system name match this event. * @match: Check whether given event and system name match this event. The argc
* Return true if it matches, otherwides false. * and argv is used for exact match. Return true if it matches, otherwides
* false.
* *
* Except for @create, these methods are called under holding event_mutex. * Except for @create, these methods are called under holding event_mutex.
*/ */
...@@ -43,7 +44,7 @@ struct dyn_event_operations { ...@@ -43,7 +44,7 @@ struct dyn_event_operations {
bool (*is_busy)(struct dyn_event *ev); bool (*is_busy)(struct dyn_event *ev);
int (*free)(struct dyn_event *ev); int (*free)(struct dyn_event *ev);
bool (*match)(const char *system, const char *event, bool (*match)(const char *system, const char *event,
struct dyn_event *ev); int argc, const char **argv, struct dyn_event *ev);
}; };
/* Register new dyn_event type -- must be called at first */ /* Register new dyn_event type -- must be called at first */
......
...@@ -374,7 +374,7 @@ static int synth_event_show(struct seq_file *m, struct dyn_event *ev); ...@@ -374,7 +374,7 @@ static int synth_event_show(struct seq_file *m, struct dyn_event *ev);
static int synth_event_release(struct dyn_event *ev); static int synth_event_release(struct dyn_event *ev);
static bool synth_event_is_busy(struct dyn_event *ev); static bool synth_event_is_busy(struct dyn_event *ev);
static bool synth_event_match(const char *system, const char *event, static bool synth_event_match(const char *system, const char *event,
struct dyn_event *ev); int argc, const char **argv, struct dyn_event *ev);
static struct dyn_event_operations synth_event_ops = { static struct dyn_event_operations synth_event_ops = {
.create = synth_event_create, .create = synth_event_create,
...@@ -422,7 +422,7 @@ static bool synth_event_is_busy(struct dyn_event *ev) ...@@ -422,7 +422,7 @@ static bool synth_event_is_busy(struct dyn_event *ev)
} }
static bool synth_event_match(const char *system, const char *event, static bool synth_event_match(const char *system, const char *event,
struct dyn_event *ev) int argc, const char **argv, struct dyn_event *ev)
{ {
struct synth_event *sev = to_synth_event(ev); struct synth_event *sev = to_synth_event(ev);
......
...@@ -39,7 +39,7 @@ static int trace_kprobe_show(struct seq_file *m, struct dyn_event *ev); ...@@ -39,7 +39,7 @@ static int trace_kprobe_show(struct seq_file *m, struct dyn_event *ev);
static int trace_kprobe_release(struct dyn_event *ev); static int trace_kprobe_release(struct dyn_event *ev);
static bool trace_kprobe_is_busy(struct dyn_event *ev); static bool trace_kprobe_is_busy(struct dyn_event *ev);
static bool trace_kprobe_match(const char *system, const char *event, static bool trace_kprobe_match(const char *system, const char *event,
struct dyn_event *ev); int argc, const char **argv, struct dyn_event *ev);
static struct dyn_event_operations trace_kprobe_ops = { static struct dyn_event_operations trace_kprobe_ops = {
.create = trace_kprobe_create, .create = trace_kprobe_create,
...@@ -138,7 +138,7 @@ static bool trace_kprobe_is_busy(struct dyn_event *ev) ...@@ -138,7 +138,7 @@ static bool trace_kprobe_is_busy(struct dyn_event *ev)
} }
static bool trace_kprobe_match(const char *system, const char *event, static bool trace_kprobe_match(const char *system, const char *event,
struct dyn_event *ev) int argc, const char **argv, struct dyn_event *ev)
{ {
struct trace_kprobe *tk = to_trace_kprobe(ev); struct trace_kprobe *tk = to_trace_kprobe(ev);
......
...@@ -44,7 +44,7 @@ static int trace_uprobe_show(struct seq_file *m, struct dyn_event *ev); ...@@ -44,7 +44,7 @@ static int trace_uprobe_show(struct seq_file *m, struct dyn_event *ev);
static int trace_uprobe_release(struct dyn_event *ev); static int trace_uprobe_release(struct dyn_event *ev);
static bool trace_uprobe_is_busy(struct dyn_event *ev); static bool trace_uprobe_is_busy(struct dyn_event *ev);
static bool trace_uprobe_match(const char *system, const char *event, static bool trace_uprobe_match(const char *system, const char *event,
struct dyn_event *ev); int argc, const char **argv, struct dyn_event *ev);
static struct dyn_event_operations trace_uprobe_ops = { static struct dyn_event_operations trace_uprobe_ops = {
.create = trace_uprobe_create, .create = trace_uprobe_create,
...@@ -285,7 +285,7 @@ static bool trace_uprobe_is_busy(struct dyn_event *ev) ...@@ -285,7 +285,7 @@ static bool trace_uprobe_is_busy(struct dyn_event *ev)
} }
static bool trace_uprobe_match(const char *system, const char *event, static bool trace_uprobe_match(const char *system, const char *event,
struct dyn_event *ev) int argc, const char **argv, struct dyn_event *ev)
{ {
struct trace_uprobe *tu = to_trace_uprobe(ev); struct trace_uprobe *tu = to_trace_uprobe(ev);
......
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