Skip to content

Commit 62de4f2

Browse files
committed
trace: Add __print_ns_to_secs() and __print_ns_without_secs() helpers
To have nanosecond output displayed in a more human readable format, its nicer to convert it to a seconds format (XXX.YYYYYYYYY). The problem is that to do so, the numbers must be divided by NSEC_PER_SEC, and moded too. But as these numbers are 64 bit, this can not be done simply with '/' and '%' operators, but must use do_div() instead. Instead of performing the expensive do_div() in the hot path of the tracepoint, it is more efficient to perform it during the output phase. But passing in do_div() can confuse the parser, and do_div() doesn't work exactly like a normal C function. It modifies the number in place, and we don't want to modify the actual values in the ring buffer. Two helper functions are now created: __print_ns_to_secs() and __print_ns_without_secs() They both take a value of nanoseconds, and the former will return that number divided by NSEC_PER_SEC, and the latter will mod it with NSEC_PER_SEC giving a way to print a nice human readable format: __print_fmt("time=%llu.%09u", __print_ns_to_secs(REC->nsec_val), __print_ns_without_secs(REC->nsec_val)) Link: https://lkml.kernel.org/r/e503b903045496c4ccde52843e1e318b422f7a56.1624372313.git.bristot@redhat.com Cc: Phil Auld <[email protected]> Cc: Sebastian Andrzej Siewior <[email protected]> Cc: Kate Carcia <[email protected]> Cc: Jonathan Corbet <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Alexandre Chartre <[email protected]> Cc: Clark Willaims <[email protected]> Cc: John Kacur <[email protected]> Cc: Juri Lelli <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Signed-off-by: Steven Rostedt <[email protected]> Signed-off-by: Daniel Bristot de Oliveira <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
1 parent aa892f8 commit 62de4f2

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

include/trace/trace_events.h

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,21 @@ TRACE_MAKE_SYSTEM_STR();
358358
trace_print_hex_dump_seq(p, prefix_str, prefix_type, \
359359
rowsize, groupsize, buf, len, ascii)
360360

361+
#undef __print_ns_to_secs
362+
#define __print_ns_to_secs(value) \
363+
({ \
364+
u64 ____val = (u64)(value); \
365+
do_div(____val, NSEC_PER_SEC); \
366+
____val; \
367+
})
368+
369+
#undef __print_ns_without_secs
370+
#define __print_ns_without_secs(value) \
371+
({ \
372+
u64 ____val = (u64)(value); \
373+
(u32) do_div(____val, NSEC_PER_SEC); \
374+
})
375+
361376
#undef DECLARE_EVENT_CLASS
362377
#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
363378
static notrace enum print_line_t \
@@ -736,6 +751,16 @@ static inline void ftrace_test_probe_##call(void) \
736751
#undef __print_array
737752
#undef __print_hex_dump
738753

754+
/*
755+
* The below is not executed in the kernel. It is only what is
756+
* displayed in the print format for userspace to parse.
757+
*/
758+
#undef __print_ns_to_secs
759+
#define __print_ns_to_secs(val) (val) / 1000000000UL
760+
761+
#undef __print_ns_without_secs
762+
#define __print_ns_without_secs(val) (val) % 1000000000UL
763+
739764
#undef TP_printk
740765
#define TP_printk(fmt, args...) "\"" fmt "\", " __stringify(args)
741766

0 commit comments

Comments
 (0)