From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756703Ab2DFLsR (ORCPT ); Fri, 6 Apr 2012 07:48:17 -0400 Received: from mail.skyhub.de ([78.46.96.112]:33147 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756356Ab2DFLsQ (ORCPT ); Fri, 6 Apr 2012 07:48:16 -0400 Date: Fri, 6 Apr 2012 13:48:12 +0200 From: Borislav Petkov To: Frederic Weisbecker Cc: LKML , Steven Rostedt , Steven Rostedt , Ingo Molnar , Thomas Gleixner , Peter Zijlstra , Arnaldo Carvalho de Melo , Jiri Olsa , Arun Sharma , Namhyung Kim Subject: Re: [PATCH 04/15] events: Update tools/lib/traceevent to work with perf Message-ID: <20120406114812.GE30425@liondog.tnic> Mail-Followup-To: Borislav Petkov , Frederic Weisbecker , LKML , Steven Rostedt , Steven Rostedt , Ingo Molnar , Thomas Gleixner , Peter Zijlstra , Arnaldo Carvalho de Melo , Jiri Olsa , Arun Sharma , Namhyung Kim References: <1333666086-6517-1-git-send-email-fweisbec@gmail.com> <1333666086-6517-5-git-send-email-fweisbec@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1333666086-6517-5-git-send-email-fweisbec@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Apr 06, 2012 at 12:47:55AM +0200, Frederic Weisbecker wrote: > From: Steven Rostedt > > Some of the util functions of libtraceevent.a conflict with perf, > such as die(), warning() and others. Move them into event-util.h Minor: judging by the patch below, you mean "event-utils.h" here. > that is not included by the perf tools. > > Also, as perf compiles with 'bool' the filter_arg->bool needs to > be renamed to filter_arg->boolean. > > Signed-off-by: Steven Rostedt > Cc: Ingo Molnar > Cc: Thomas Gleixner > Cc: Peter Zijlstra > Cc: Arnaldo Carvalho de Melo > Cc: Steven Rostedt > Cc: Borislav Petkov > Cc: Jiri Olsa > Cc: Arun Sharma > Cc: Namhyung Kim > Signed-off-by: Frederic Weisbecker > --- > tools/lib/traceevent/event-parse.c | 1 + > tools/lib/traceevent/event-parse.h | 20 +++----------------- > tools/lib/traceevent/event-utils.h | 16 ++++++++++++++++ > tools/lib/traceevent/parse-filter.c | 32 ++++++++++++++++---------------- > tools/lib/traceevent/trace-seq.c | 1 + > 5 files changed, 37 insertions(+), 33 deletions(-) > > diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c > index 47a3227..3ce75b5 100644 > --- a/tools/lib/traceevent/event-parse.c > +++ b/tools/lib/traceevent/event-parse.c > @@ -33,6 +33,7 @@ > #include > > #include "event-parse.h" > +#include "event-utils.h" ^^^^^^^^^^^^^ -- Regards/Gruss, Boris.