Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d857ace1 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Steven Rostedt
Browse files

tracing/ksym_tracer: fix the output of ksym tracer 



Fix the output format of ksym tracer, make it properly aligned

Befor patch:
# tracer: ksym_tracer
#
#       TASK-PID      CPU#      Symbol         Type    Function
#          |           |          |              |         |
bash            1378  1   ksym_tracer_mutex     W  mutex_lock+0x11/0x27
bash            1378  1   ksym_filter_head      W  process_new_ksym_entry+0xd2/0x10c
bash            1378  1   ksym_tracer_mutex     W  mutex_unlock+0x12/0x1b
cat             1429  0   ksym_tracer_mutex     W  mutex_lock+0x11/0x27

After patch:
# tracer: ksym_tracer
#
#       TASK-PID   CPU#      Symbol                    Type    Function
#          |        |          |                        |         |
        cat-1423  [000] ksym_tracer_mutex               RW mutex_lock+0x11/0x27
        cat-1423  [000] ksym_filter_head                RW ksym_trace_filter_read+0x6e/0x10d
        cat-1423  [000] ksym_tracer_mutex               RW mutex_unlock+0x12/0x1b
        cat-1423  [000] ksym_tracer_mutex               RW mutex_lock+0x11/0x27
        cat-1423  [000] ksym_filter_head                RW ksym_trace_filter_read+0x6e/0x10d
        cat-1423  [000] ksym_tracer_mutex               RW mutex_unlock+0x12/0x1b

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
LKML-Reference: <4A6685BB.2090809@cn.fujitsu.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 9d7e9344

kernel/trace/trace_ksym.c

+6 −7
Original line number Diff line number Diff line
@@ -370,13 +370,12 @@ static int ksym_trace_init(struct trace_array *tr) 


static void ksym_trace_print_header(struct seq_file *m)

{



	seq_puts(m,

		 "#       TASK-PID      CPU#      Symbol         Type    "

		 "Function         \n");

		 "#       TASK-PID   CPU#      Symbol                    "

		 "Type    Function\n");

	seq_puts(m,

		 "#          |           |          |              |         "

		 "|            \n");

		 "#          |        |          |                       "

		 " |         |\n");

}



static enum print_line_t ksym_trace_output(struct trace_iterator *iter)
@@ -392,7 +391,7 @@ static enum print_line_t ksym_trace_output(struct trace_iterator *iter) 


	trace_assign_type(field, entry);



	ret = trace_seq_printf(s, "%-15s %-5d %-3d %-20s ", field->cmd,

	ret = trace_seq_printf(s, "%11s-%-5d [%03d] %-30s ", field->cmd,

				entry->pid, iter->cpu, field->ksym_name);

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;
@@ -412,7 +411,7 @@ static enum print_line_t ksym_trace_output(struct trace_iterator *iter) 
		return TRACE_TYPE_PARTIAL_LINE;



	sprint_symbol(str, field->ip);

	ret = trace_seq_printf(s, "%-20s\n", str);

	ret = trace_seq_printf(s, "%s\n", str);

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;