ftrace: Decouple hash items from showing filtered functions
The set_ftrace_filter shows "hashed" functions, which are functions that are added with operations to them (like traceon and traceoff). As other subsystems may be able to show what functions they are using for function tracing, the hash items should no longer be shown just because the FILTER flag is set. As they have nothing to do with other subsystems filters. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
parent
fc13cb0ce4
commit
69a3083c4a
|
@ -206,8 +206,9 @@ enum {
|
|||
FTRACE_ITER_FILTER = (1 << 0),
|
||||
FTRACE_ITER_NOTRACE = (1 << 1),
|
||||
FTRACE_ITER_PRINTALL = (1 << 2),
|
||||
FTRACE_ITER_HASH = (1 << 3),
|
||||
FTRACE_ITER_ENABLED = (1 << 4),
|
||||
FTRACE_ITER_DO_HASH = (1 << 3),
|
||||
FTRACE_ITER_HASH = (1 << 4),
|
||||
FTRACE_ITER_ENABLED = (1 << 5),
|
||||
};
|
||||
|
||||
void arch_ftrace_update_code(int command);
|
||||
|
|
|
@ -2198,6 +2198,9 @@ static void *t_hash_start(struct seq_file *m, loff_t *pos)
|
|||
void *p = NULL;
|
||||
loff_t l;
|
||||
|
||||
if (!(iter->flags & FTRACE_ITER_DO_HASH))
|
||||
return NULL;
|
||||
|
||||
if (iter->func_pos > *pos)
|
||||
return NULL;
|
||||
|
||||
|
@ -2343,12 +2346,8 @@ static void *t_start(struct seq_file *m, loff_t *pos)
|
|||
break;
|
||||
}
|
||||
|
||||
if (!p) {
|
||||
if (iter->flags & FTRACE_ITER_FILTER)
|
||||
return t_hash_start(m, pos);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
if (!p)
|
||||
return t_hash_start(m, pos);
|
||||
|
||||
return iter;
|
||||
}
|
||||
|
@ -2541,8 +2540,9 @@ ftrace_regex_open(struct ftrace_ops *ops, int flag,
|
|||
static int
|
||||
ftrace_filter_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return ftrace_regex_open(&global_ops, FTRACE_ITER_FILTER,
|
||||
inode, file);
|
||||
return ftrace_regex_open(&global_ops,
|
||||
FTRACE_ITER_FILTER | FTRACE_ITER_DO_HASH,
|
||||
inode, file);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
Loading…
Reference in New Issue