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

Commit 5ef841f6 authored by Steven Rostedt's avatar Steven Rostedt
Browse files

tracing: make print_(b)printk_msg_only global 



This patch makes print_printk_msg_only and print_bprintk_msg_only
global for other functions to use. It also renames them by adding
a "trace_" to the beginning to avoid namespace collisions.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
parent ac5f6c96

kernel/trace/trace.c

+2 −34
Original line number Diff line number Diff line
@@ -1694,38 +1694,6 @@ static enum print_line_t print_hex_fmt(struct trace_iterator *iter) 
	return TRACE_TYPE_HANDLED;

}



static enum print_line_t print_bprintk_msg_only(struct trace_iterator *iter)

{

	struct trace_seq *s = &iter->seq;

	struct trace_entry *entry = iter->ent;

	struct bprint_entry *field;

	int ret;



	trace_assign_type(field, entry);



	ret = trace_seq_bprintf(s, field->fmt, field->buf);

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;



	return TRACE_TYPE_HANDLED;

}



static enum print_line_t print_printk_msg_only(struct trace_iterator *iter)

{

	struct trace_seq *s = &iter->seq;

	struct trace_entry *entry = iter->ent;

	struct print_entry *field;

	int ret;



	trace_assign_type(field, entry);



	ret = trace_seq_printf(s, "%s", field->buf);

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;



	return TRACE_TYPE_HANDLED;

}



static enum print_line_t print_bin_fmt(struct trace_iterator *iter)

{

	struct trace_seq *s = &iter->seq;
@@ -1787,12 +1755,12 @@ static enum print_line_t print_trace_line(struct trace_iterator *iter) 
	if (iter->ent->type == TRACE_BPRINT &&

			trace_flags & TRACE_ITER_PRINTK &&

			trace_flags & TRACE_ITER_PRINTK_MSGONLY)

		return print_bprintk_msg_only(iter);

		return trace_print_bprintk_msg_only(iter);



	if (iter->ent->type == TRACE_PRINT &&

			trace_flags & TRACE_ITER_PRINTK &&

			trace_flags & TRACE_ITER_PRINTK_MSGONLY)

		return print_printk_msg_only(iter);

		return trace_print_printk_msg_only(iter);



	if (trace_flags & TRACE_ITER_BIN)

		return print_bin_fmt(iter);

kernel/trace/trace_output.c

+32 −0
Original line number Diff line number Diff line
@@ -19,6 +19,38 @@ static struct hlist_head event_hash[EVENT_HASHSIZE] __read_mostly; 


static int next_event_type = __TRACE_LAST_TYPE + 1;



enum print_line_t trace_print_bprintk_msg_only(struct trace_iterator *iter)

{

	struct trace_seq *s = &iter->seq;

	struct trace_entry *entry = iter->ent;

	struct bprint_entry *field;

	int ret;



	trace_assign_type(field, entry);



	ret = trace_seq_bprintf(s, field->fmt, field->buf);

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;



	return TRACE_TYPE_HANDLED;

}



enum print_line_t trace_print_printk_msg_only(struct trace_iterator *iter)

{

	struct trace_seq *s = &iter->seq;

	struct trace_entry *entry = iter->ent;

	struct print_entry *field;

	int ret;



	trace_assign_type(field, entry);



	ret = trace_seq_printf(s, "%s", field->buf);

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;



	return TRACE_TYPE_HANDLED;

}



/**

 * trace_seq_printf - sequence printing of trace information

 * @s: trace sequence descriptor

kernel/trace/trace_output.h

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ struct trace_event { 
	trace_print_func	binary;

};



extern enum print_line_t

trace_print_bprintk_msg_only(struct trace_iterator *iter);

extern enum print_line_t

trace_print_printk_msg_only(struct trace_iterator *iter);



extern int trace_seq_printf(struct trace_seq *s, const char *fmt, ...)

	__attribute__ ((format (printf, 2, 3)));

extern int