From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754967AbeBGUb7 (ORCPT ); Wed, 7 Feb 2018 15:31:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:35762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754641AbeBGU2S (ORCPT ); Wed, 7 Feb 2018 15:28:18 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2D8F2217B5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=rostedt@goodmis.org Message-Id: <20180207202816.204065489@goodmis.org> User-Agent: quilt/0.63-1 Date: Wed, 07 Feb 2018 15:24:12 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Ingo Molnar , Andrew Morton , Thomas Gleixner , Peter Zijlstra , Masami Hiramatsu , Tom Zanussi , linux-rt-users@vger.kernel.org, linux-trace-users@vger.kernel.org, Arnaldo Carvalho de Melo , Clark Williams , Jiri Olsa , Daniel Bristot de Oliveira , Juri Lelli Subject: [PATCH 10/20 v2] tracing: Make func_type enums for easier comparing of arg types References: <20180207202402.253089656@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0010-tracing-Make-func_type-enums-for-easier-comparing-of.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Steven Rostedt (VMware)" For the function based event args, knowing quickly what type they are is advantageous, as decisions can be made quickly based on them. Having an enum for the types is useful for this purpose. Use macros to create both the func_type array as well as enums that match the type to the index into that array. Signed-off-by: Steven Rostedt (VMware) --- kernel/trace/trace_event_ftrace.c | 47 +++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/kernel/trace/trace_event_ftrace.c b/kernel/trace/trace_event_ftrace.c index 1fa281386fa0..6e48361643c0 100644 --- a/kernel/trace/trace_event_ftrace.c +++ b/kernel/trace/trace_event_ftrace.c @@ -24,6 +24,7 @@ struct func_arg { short size; s8 arg; u8 sign; + u8 func_type; }; struct func_event { @@ -79,31 +80,42 @@ typedef u8 x8; #define TYPE_TUPLE(type) \ { #type, sizeof(type), is_signed_type(type) } +#define FUNC_TYPES \ + TYPE_TUPLE(long), \ + TYPE_TUPLE(int), \ + TYPE_TUPLE(short), \ + TYPE_TUPLE(char), \ + TYPE_TUPLE(size_t), \ + TYPE_TUPLE(u64), \ + TYPE_TUPLE(s64), \ + TYPE_TUPLE(x64), \ + TYPE_TUPLE(u32), \ + TYPE_TUPLE(s32), \ + TYPE_TUPLE(x32), \ + TYPE_TUPLE(u16), \ + TYPE_TUPLE(s16), \ + TYPE_TUPLE(x16), \ + TYPE_TUPLE(u8), \ + TYPE_TUPLE(s8), \ + TYPE_TUPLE(x8) + static struct func_type { char *name; int size; int sign; } func_types[] = { - TYPE_TUPLE(long), - TYPE_TUPLE(int), - TYPE_TUPLE(short), - TYPE_TUPLE(char), - TYPE_TUPLE(size_t), - TYPE_TUPLE(u64), - TYPE_TUPLE(s64), - TYPE_TUPLE(x64), - TYPE_TUPLE(u32), - TYPE_TUPLE(s32), - TYPE_TUPLE(x32), - TYPE_TUPLE(u16), - TYPE_TUPLE(s16), - TYPE_TUPLE(x16), - TYPE_TUPLE(u8), - TYPE_TUPLE(s8), - TYPE_TUPLE(x8), + FUNC_TYPES, { NULL, 0, 0 } }; +#undef TYPE_TUPLE +#define TYPE_TUPLE(type) FUNC_TYPE_##type + +enum { + FUNC_TYPES, + FUNC_TYPE_MAX +}; + static int max_args __read_mostly = -1; /** @@ -230,6 +242,7 @@ static int add_arg(struct func_event *fevent, int ftype, int unsign) if (!unsign) arg->sign = func_type->sign; arg->offset = ALIGN(fevent->arg_offset, arg->size); + arg->func_type = ftype; arg->arg = fevent->arg_cnt; fevent->arg_offset = arg->offset + arg->size; -- 2.15.1