use defined fields and print_fmt to print formats
PATCH 9/10 use defined fields and print_fmt to print formats
It seems that ftrace_format_##call() and ftrace_define_fields_##call() are duplicate more or less.
trace_define_field() defines fields and links them into strcut ftrace_event_call. We reuse them to print formats and remove ftrace_format_##call(). It make all things simpler.
Signed-off-by Lai Jiangshan <[email protected]>
---
kernel/trace/trace_events.c +35 -5
@@ -551,9 +551,11 @@ event_format_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) {struct ftrace_event_call *call = filp->private_data; +struct ftrace_event_field *field;struct trace_seq *s; +int common_field_count =5 ;char *buf; -int r; +int r =0 ;if (*ppos)return 0 ;
@@ -564,14 +566,42 @@ event_format_read(struct file *filp, char __user *ubuf, size_t cnt,trace_seq_init (s); -/* If any of the first writes fail, so will the show_format. */ -trace_seq_printf (s,"name: %s\n" , call->name);trace_seq_printf (s,"ID: %d\n" , call->id);trace_seq_printf (s,"format:\n" ); -trace_write_header (s); - r = call->show_format (call, s); +list_for_each_entry_reverse (field, &call->fields, link) { +const char *array_descriptor =strchr (field->type,'[' ); + +if (!strncmp (field->type,"__data_loc" ,10 )) + array_descriptor =NULL ; + +if (!array_descriptor) { + r =trace_seq_printf (s,"\tfield:%s %s;\toffset:%u;" +"\tsize:%u;\tsigned:%d;\n" , + field->type, field->name, field->offset, + field->size, !!field->is_signed); + }else { + r =trace_seq_printf (s,"\tfield:%.*s %s%s;\toffset:%u;" +"\tsize:%u;\tsigned:%d;\n" , + array_descriptor - field->type, + field->type, field->name, + array_descriptor, field->offset, + field->size, !!field->is_signed); + } + +if (--common_field_count ==0 ) + r =trace_seq_printf (s,"\n" ); + +if (!r) +break ; + } + +if (r) { + r =trace_seq_printf (s,"\nprint fmt: %s\n" , + call->print_fmt); + } +if (!r) {/* * ug! The format output is bigger than a PAGE!!