Commit eaa7a897 authored by Yordan Karadzhov (VMware)'s avatar Yordan Karadzhov (VMware) Committed by Steven Rostedt (VMware)
Browse files

tracing: Define static void trace_print_time() 

The part of the code that prints the time of the trace record in
"int trace_print_context()" gets extracted in a static function. This
is done as a preparation for a following patch, in which we will define
a new ftrace event called "func_repeats". The new static method,
defined here, will be used by this new event to print the time of the
last repeat of a function that is consecutively called number of times.

Link: https://lkml.kernel.org/r/20210415181854.147448-2-y.karadz@gmail.com



Signed-off-by: default avatarYordan Karadzhov (VMware) <y.karadz@gmail.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent ceaaa129

kernel/trace/trace_output.c

+17 −9
Original line number Diff line number Diff line
@@ -587,13 +587,26 @@ lat_print_timestamp(struct trace_iterator *iter, u64 next_ts) 
	return !trace_seq_has_overflowed(s);

}



static void trace_print_time(struct trace_seq *s, struct trace_iterator *iter,

			     unsigned long long ts)

{

	unsigned long secs, usec_rem;

	unsigned long long t;



	if (iter->iter_flags & TRACE_FILE_TIME_IN_NS) {

		t = ns2usecs(ts);

		usec_rem = do_div(t, USEC_PER_SEC);

		secs = (unsigned long)t;

		trace_seq_printf(s, " %5lu.%06lu", secs, usec_rem);

	} else

		trace_seq_printf(s, " %12llu", ts);

}



int trace_print_context(struct trace_iterator *iter)

{

	struct trace_array *tr = iter->tr;

	struct trace_seq *s = &iter->seq;

	struct trace_entry *entry = iter->ent;

	unsigned long long t;

	unsigned long secs, usec_rem;

	char comm[TASK_COMM_LEN];



	trace_find_cmdline(entry->pid, comm);
@@ -614,13 +627,8 @@ int trace_print_context(struct trace_iterator *iter) 
	if (tr->trace_flags & TRACE_ITER_IRQ_INFO)

		trace_print_lat_fmt(s, entry);



	if (iter->iter_flags & TRACE_FILE_TIME_IN_NS) {

		t = ns2usecs(iter->ts);

		usec_rem = do_div(t, USEC_PER_SEC);

		secs = (unsigned long)t;

		trace_seq_printf(s, " %5lu.%06lu: ", secs, usec_rem);

	} else

		trace_seq_printf(s, " %12llu: ", iter->ts);

	trace_print_time(s, iter, iter->ts);

	trace_seq_puts(s, ": ");



	return !trace_seq_has_overflowed(s);

}