From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752812AbbCXPEf (ORCPT ); Tue, 24 Mar 2015 11:04:35 -0400 Received: from smtprelay0148.hostedemail.com ([216.40.44.148]:39038 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752547AbbCXPEc convert rfc822-to-8bit (ORCPT ); Tue, 24 Mar 2015 11:04:32 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::,RULES_HIT:41:334:355:368:369:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1431:1437:1513:1515:1516:1518:1521:1534:1542:1593:1594:1711:1730:1747:1777:1792:2198:2199:2393:2553:2559:2562:2693:3138:3139:3140:3141:3142:3354:3622:3865:3867:3868:3870:3871:3872:3874:4321:5007:6119:6261:7576:7875:8603:9010:9545:10004:10400:10848:10967:11026:11232:11658:11914:12043:12262:12296:12438:12517:12519:12555:12679:12740:13138:13153:13221:13228:13229:13231:14096:14097:21080,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 X-HE-Tag: sound32_444940085a655 X-Filterd-Recvd-Size: 3771 Date: Tue, 24 Mar 2015 11:04:28 -0400 From: Steven Rostedt To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Jiri Olsa , Namhyung Kim , Andrew Morton , Guilherme Cox Subject: Re: [PATCH 0/9] tools lib traceevent: Pulling in updates from trace-cmd Message-ID: <20150324110428.486d3293@gandalf.local.home> In-Reply-To: <20150324145727.GA5447@kernel.org> References: <20150324135748.506437888@goodmis.org> <20150324145727.GA5447@kernel.org> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; 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 Tue, 24 Mar 2015 11:57:27 -0300 Arnaldo Carvalho de Melo wrote: > Em Tue, Mar 24, 2015 at 09:57:48AM -0400, Steven Rostedt escreveu: > > Arnaldo, > > > > I took a look at the differences between what I have in trace-cmd and > > what is sitting in tools/lib/traceevent, and I put together a patch set > > that brings in fixes and updates to libtraceevent. > > Thanks, will process now. I just added this one too... -- Steve >>From fe80b2e9396fa6b8dc66a6dfd4c7a426e1685424 Mon Sep 17 00:00:00 2001 From: Guilherme Cox Date: Fri, 20 Feb 2015 19:10:34 -0500 Subject: [PATCH] tools lib traceevent: Zero should not be considered "not found" in eval_flag() Guilherme Cox found that: There is, however, a potential bug if there is an item with code zero that is not the first one in the symbol list, since eval_flag(..) returns 0 when it doesn't find anything. Reported-by: Guilherme Cox Signed-off-by: Steven Rostedt --- tools/lib/traceevent/event-parse.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index aff743710001..f2fb50141703 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -3576,7 +3576,7 @@ static const struct flag flags[] = { { "HRTIMER_RESTART", 1 }, }; -static unsigned long long eval_flag(const char *flag) +static long long eval_flag(const char *flag) { int i; @@ -3592,7 +3592,7 @@ static unsigned long long eval_flag(const char *flag) if (strcmp(flags[i].name, flag) == 0) return flags[i].value; - return 0; + return -1LL; } static void print_str_to_seq(struct trace_seq *s, const char *format, @@ -3666,7 +3666,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, struct print_flag_sym *flag; struct format_field *field; struct printk_map *printk; - unsigned long long val, fval; + long long val, fval; unsigned long addr; char *str; unsigned char *hex; @@ -3725,11 +3725,11 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, print = 0; for (flag = arg->flags.flags; flag; flag = flag->next) { fval = eval_flag(flag->value); - if (!val && !fval) { + if (!val && fval < 0) { print_str_to_seq(s, format, len_arg, flag->str); break; } - if (fval && (val & fval) == fval) { + if (fval > 0 && (val & fval) == fval) { if (print && arg->flags.delim) trace_seq_puts(s, arg->flags.delim); print_str_to_seq(s, format, len_arg, flag->str); -- 1.8.3.1