On Fri, 18 Nov 2016 20:40:22 -0300 Arnaldo Carvalho de Melo <a...@kernel.org> wrote:
> Em Fri, Nov 18, 2016 at 05:54:01PM -0500, Steven Rostedt escreveu: > > From: "Steven Rostedt (Red Hat)" <rost...@goodmis.org> > > > > Instead of using 1000000, define a USECS_PER_SEC macro and use that > > instead. > > We already have it in tools/include/linux/time64.h :-) Here's v2 then. Can you take both patches? -- Steve >From 856b584cb783b658d200aa3fca8faba58d52ae82 Mon Sep 17 00:00:00 2001 From: "Steven Rostedt (Red Hat)" <rost...@goodmis.org> Date: Tue, 9 Feb 2016 15:40:15 -0500 Subject: [PATCH] tools lib traceevent: Use USEC_PER_SEC instead of hardcoded number Instead of using 1000000, use the define in time64.h instead. Also remove the the duplicate defines for NSECS_PER_SEC. Link: http://lkml.kernel.org/r/20160209204237.006667...@goodmis.org Signed-off-by: Steven Rostedt <rost...@goodmis.org> --- tools/lib/traceevent/event-parse.c | 11 ++++++----- tools/lib/traceevent/event-parse.h | 3 --- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index d6f3cc0a29b0..8206227866dc 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -33,6 +33,7 @@ #include <stdint.h> #include <limits.h> #include <linux/string.h> +#include <linux/time64.h> #include <netinet/in.h> #include "event-parse.h" @@ -5450,8 +5451,8 @@ void pevent_print_event_time(struct pevent *pevent, struct trace_seq *s, use_usec_format = is_timestamp_in_us(pevent->trace_clock, use_trace_clock); if (use_usec_format) { - secs = record->ts / NSECS_PER_SEC; - nsecs = record->ts - secs * NSECS_PER_SEC; + secs = record->ts / NSEC_PER_SEC; + nsecs = record->ts - secs * NSEC_PER_SEC; } if (pevent->latency_format) { @@ -5463,10 +5464,10 @@ void pevent_print_event_time(struct pevent *pevent, struct trace_seq *s, usecs = nsecs; p = 9; } else { - usecs = (nsecs + 500) / NSECS_PER_USEC; + usecs = (nsecs + 500) / NSEC_PER_USEC; /* To avoid usecs larger than 1 sec */ - if (usecs >= 1000000) { - usecs -= 1000000; + if (usecs >= USEC_PER_SEC) { + usecs -= USEC_PER_SEC; secs++; } p = 6; diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h index 41b3d2238ed3..dfa06f4e7abf 100644 --- a/tools/lib/traceevent/event-parse.h +++ b/tools/lib/traceevent/event-parse.h @@ -172,9 +172,6 @@ struct pevent_plugin_option { #define PEVENT_PLUGIN_OPTIONS_NAME MAKE_STR(PEVENT_PLUGIN_OPTIONS) #define PEVENT_PLUGIN_ALIAS_NAME MAKE_STR(PEVENT_PLUGIN_ALIAS) -#define NSECS_PER_SEC 1000000000ULL -#define NSECS_PER_USEC 1000ULL - enum format_flags { FIELD_IS_ARRAY = 1, FIELD_IS_POINTER = 2, -- 2.1.0
