From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754452AbcKUQmB convert rfc822-to-8bit (ORCPT ); Mon, 21 Nov 2016 11:42:01 -0500 Received: from smtprelay0033.hostedemail.com ([216.40.44.33]:41895 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753535AbcKUQmA (ORCPT ); Mon, 21 Nov 2016 11:42:00 -0500 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 50,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::,RULES_HIT:41:355:379:541:560:599:800:960:967:968:973:988:989:1183:1260:1263:1277:1311:1313:1314:1345:1359:1431:1437:1513:1515:1516:1518:1521:1534:1542:1593:1594:1711:1730:1747:1777:1792:2393:2525:2553:2560:2563:2682:2685:2859:2902:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3354:3622:3865:3866:3867:3868:3870:3872:3873:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4560:5007:6238:6261:7576:7875:8599:9025:9545:9592:10004:10400:10848:10913:10967:11026:11232:11473:11658:11914:12043:12262:12296:12438:12555:12679:12739:12740:12783:12986:13255:13439:13846:14096:14097:14181:14659:14721:14849:21080:21451:30034:30054:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:10,LUA_SUMMARY:none X-HE-Tag: beam49_4a69cd1d65634 X-Filterd-Recvd-Size: 3993 Date: Mon, 21 Nov 2016 11:41:49 -0500 From: Steven Rostedt To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Jiri Olsa , Namhyung Kim , Andrew Morton Subject: Re: [PATCH 2/2] tools lib traceevent: Use USECS_PER_SEC instead of hardcoded number Message-ID: <20161121114149.67111981@gandalf.local.home> In-Reply-To: <20161118234022.GK11932@kernel.org> References: <20161118225359.378120451@goodmis.org> <20161118225457.987025355@goodmis.org> <20161118234022.GK11932@kernel.org> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 18 Nov 2016 20:40:22 -0300 Arnaldo Carvalho de Melo wrote: > Em Fri, Nov 18, 2016 at 05:54:01PM -0500, Steven Rostedt escreveu: > > From: "Steven Rostedt (Red Hat)" > > > > 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)" 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.006667394@goodmis.org Signed-off-by: Steven Rostedt --- 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 #include #include +#include #include #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