Skip to content

Commit

Permalink
ftrace: add thread comm to function graph tracer
Browse files Browse the repository at this point in the history
Impact: enhancement to function graph tracer

Export the trace_find_cmdline so the function graph tracer can
use it to print the comms of the threads.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Steven Rostedt authored and Ingo Molnar committed Nov 26, 2008
1 parent e53a631 commit 660c7f9
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ static void trace_save_cmdline(struct task_struct *tsk)
spin_unlock(&trace_cmdline_lock);
}

static char *trace_find_cmdline(int pid)
char *trace_find_cmdline(int pid)
{
char *cmdline = "<...>";
unsigned map;
Expand Down
1 change: 1 addition & 0 deletions kernel/trace/trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ struct tracer_switch_ops {
struct tracer_switch_ops *next;
};

char *trace_find_cmdline(int pid);
#endif /* CONFIG_CONTEXT_SWITCH_TRACER */

#ifdef CONFIG_DYNAMIC_FTRACE
Expand Down
21 changes: 16 additions & 5 deletions kernel/trace/trace_functions_graph.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,40 @@ static pid_t last_pid = -1;

static int graph_trace_init(struct trace_array *tr)
{
int cpu;
int cpu, ret;

for_each_online_cpu(cpu)
tracing_reset(tr, cpu);

return register_ftrace_graph(&trace_graph_return,
ret = register_ftrace_graph(&trace_graph_return,
&trace_graph_entry);
if (ret)
return ret;
tracing_start_cmdline_record();

return 0;
}

static void graph_trace_reset(struct trace_array *tr)
{
unregister_ftrace_graph();
tracing_stop_cmdline_record();
unregister_ftrace_graph();
}

/* If the pid changed since the last trace, output this event */
static int verif_pid(struct trace_seq *s, pid_t pid)
{
char *comm;

if (last_pid != -1 && last_pid == pid)
return 1;

last_pid = pid;
return trace_seq_printf(s, "\n------------8<---------- thread %d"
comm = trace_find_cmdline(pid);

return trace_seq_printf(s, "\n------------8<---------- thread %s-%d"
" ------------8<----------\n\n",
pid);
comm, pid);
}

static enum print_line_t
Expand Down

0 comments on commit 660c7f9

Please sign in to comment.