Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761195AbZDQReK (ORCPT ); Fri, 17 Apr 2009 13:34:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758610AbZDQRd4 (ORCPT ); Fri, 17 Apr 2009 13:33:56 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.125]:45422 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756763AbZDQRdz (ORCPT ); Fri, 17 Apr 2009 13:33:55 -0400 Date: Fri, 17 Apr 2009 13:33:54 -0400 (EDT) From: Steven Rostedt X-X-Sender: rostedt@gandalf.stny.rr.com To: Jeremy Fitzhardinge cc: mathieu.desnoyers@polymtl.ca, Ingo Molnar , Linux Kernel Mailing List , Jeremy Fitzhardinge Subject: Re: [PATCH 2/4] x86/pvops: target CREATE_TRACE_POINTS to particular subsystems In-Reply-To: <49E8B907.9000109@goop.org> Message-ID: References: <1239950139-1119-1-git-send-email-jeremy@goop.org> <1239950139-1119-3-git-send-email-jeremy@goop.org> <49E8AAC8.5080004@goop.org> <49E8B2EB.8030108@goop.org> <49E8B907.9000109@goop.org> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2409 Lines: 93 On Fri, 17 Apr 2009, Jeremy Fitzhardinge wrote: > Steven Rostedt wrote: > > On Fri, 17 Apr 2009, Jeremy Fitzhardinge wrote: > > > > > > > Steven Rostedt wrote: > > > > > > > Ah yes! It needs to be: > > > > > > > > #ifdef CONFIG_IRQ_TRACE_POINTS > > > > #undef CONFIG_IRQ_TRACE_POINTS > > > > #include > > > > #endif > > > > > > > > Otherwise we get into the recursion again. > > > > > > > We should probably also move the #define TRACE_SYS in there as well > > > (without > > > the #undef), as it should only have one definition at a time... > > > > > > > Actually, I'm kind of against that. Just because as it stands, the > > TRACE_SYSTEM macro is up at the top, and it is easy to see. > > > > Yes, but it means that if you're in the middle of CREATE_FOO_TRACE_POINTS and > foo.h happens to include bar.h, suddenly TRACE_SUBSYSTEM becomes bar... How so? > > > Actually, we could do (from the top of the file) > > > > #ifdef CONFIG_IRQ_TRACE_POINTS > > #undef CONFIG_IRQ_TRACE_POINTS The first thing the file does is undef CONFIG_FOO_TRACE_POINTS, anything else that gets incuded, will not take this path. > > > > #define TRACE_SYSTEM irq > > > > #include > > > > #elif !defined(_TRACE_IRQ_H) || defined(TRACE_HEADER_MULTI_READ) > > #define _TRACE_IRQ_H > > > > #include > > #include > > > > > > [...] > > > > #endif > > > > That's slightly different from what we have now. At the moment its > > #if !defined(_TRACE_IRQ_H)... > ... > #endif > > #ifdef CREATE_IRQ_TRACE_POINTS > ... > #endif > > So we get both the main part of the file and the CREATE_X_TRACE_POINTS parts. > Your suggestion makes them exclusive: > > #ifdef CREATE_IRQ_TRACE_POINTS > ... > #elif !defined(_TRACE_IRQ_H)... > ... > #endif > > Does that make a difference? Hmm, I was about to disagree, but I think we need it separate. Because, we still need it to do the tracepoint conversion, and we also need to call tracepoint.h and TRACE_EVENT before calling define_trace.h. OK, scrap that idea ;-) -- Steve -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/