From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935582AbdGTJDY (ORCPT ); Thu, 20 Jul 2017 05:03:24 -0400 Received: from terminus.zytor.com ([65.50.211.136]:39607 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935530AbdGTJDW (ORCPT ); Thu, 20 Jul 2017 05:03:22 -0400 Date: Thu, 20 Jul 2017 01:58:47 -0700 From: tip-bot for David Carrillo-Cisneros Message-ID: Cc: wangnan0@huawei.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, mingo@kernel.org, davidcc@google.com, mhiramat@kernel.org, sque@chromium.org, hpa@zytor.com, dsahern@gmail.com, tglx@linutronix.de, ak@linux.intel.com, alexander.shishkin@linux.intel.com, peterz@infradead.org, eranian@google.com, pjt@google.com, acme@redhat.com, hekuang@huawei.com, namhyung@kernel.org Reply-To: dsahern@gmail.com, tglx@linutronix.de, alexander.shishkin@linux.intel.com, ak@linux.intel.com, mhiramat@kernel.org, sque@chromium.org, hpa@zytor.com, mingo@kernel.org, davidcc@google.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, namhyung@kernel.org, hekuang@huawei.com, acme@redhat.com, pjt@google.com, peterz@infradead.org, eranian@google.com In-Reply-To: <20170718042549.145161-3-davidcc@google.com> References: <20170718042549.145161-3-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf header: Add PROCESS_STR_FUN macro Git-Commit-ID: dfaa1580efcfb6b9537043ba0447747d7179fb26 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: dfaa1580efcfb6b9537043ba0447747d7179fb26 Gitweb: http://git.kernel.org/tip/dfaa1580efcfb6b9537043ba0447747d7179fb26 Author: David Carrillo-Cisneros AuthorDate: Mon, 17 Jul 2017 21:25:35 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 18 Jul 2017 23:14:28 -0300 perf header: Add PROCESS_STR_FUN macro Simplify code by adding a macro to handle the common case of processing header features that are a simple string. Signed-off-by: David Carrillo-Cisneros Acked-by: David Ahern Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: He Kuang Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Paul Turner Cc: Peter Zijlstra Cc: Simon Que Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/20170718042549.145161-3-davidcc@google.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 65 +++++++++++++----------------------------------- 1 file changed, 17 insertions(+), 48 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 24e842c..3b833f0 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1603,6 +1603,23 @@ out: return err; } +/* Macro for features that simply need to read and store a string. */ +#define FEAT_PROCESS_STR_FUN(__feat, __feat_env) \ +static int process_##__feat(struct perf_file_section *section __maybe_unused, \ + struct perf_header *ph, int fd, \ + void *data __maybe_unused) \ +{\ + ph->env.__feat_env = do_read_string(fd, ph); \ + return ph->env.__feat_env ? 0 : -ENOMEM; \ +} + +FEAT_PROCESS_STR_FUN(hostname, hostname); +FEAT_PROCESS_STR_FUN(osrelease, os_release); +FEAT_PROCESS_STR_FUN(version, version); +FEAT_PROCESS_STR_FUN(arch, arch); +FEAT_PROCESS_STR_FUN(cpudesc, cpu_desc); +FEAT_PROCESS_STR_FUN(cpuid, cpuid); + static int process_tracing_data(struct perf_file_section *section __maybe_unused, struct perf_header *ph __maybe_unused, int fd, void *data) @@ -1620,38 +1637,6 @@ static int process_build_id(struct perf_file_section *section, return 0; } -static int process_hostname(struct perf_file_section *section __maybe_unused, - struct perf_header *ph, int fd, - void *data __maybe_unused) -{ - ph->env.hostname = do_read_string(fd, ph); - return ph->env.hostname ? 0 : -ENOMEM; -} - -static int process_osrelease(struct perf_file_section *section __maybe_unused, - struct perf_header *ph, int fd, - void *data __maybe_unused) -{ - ph->env.os_release = do_read_string(fd, ph); - return ph->env.os_release ? 0 : -ENOMEM; -} - -static int process_version(struct perf_file_section *section __maybe_unused, - struct perf_header *ph, int fd, - void *data __maybe_unused) -{ - ph->env.version = do_read_string(fd, ph); - return ph->env.version ? 0 : -ENOMEM; -} - -static int process_arch(struct perf_file_section *section __maybe_unused, - struct perf_header *ph, int fd, - void *data __maybe_unused) -{ - ph->env.arch = do_read_string(fd, ph); - return ph->env.arch ? 0 : -ENOMEM; -} - static int process_nrcpus(struct perf_file_section *section __maybe_unused, struct perf_header *ph, int fd, void *data __maybe_unused) @@ -1671,22 +1656,6 @@ static int process_nrcpus(struct perf_file_section *section __maybe_unused, return 0; } -static int process_cpudesc(struct perf_file_section *section __maybe_unused, - struct perf_header *ph, int fd, - void *data __maybe_unused) -{ - ph->env.cpu_desc = do_read_string(fd, ph); - return ph->env.cpu_desc ? 0 : -ENOMEM; -} - -static int process_cpuid(struct perf_file_section *section __maybe_unused, - struct perf_header *ph, int fd, - void *data __maybe_unused) -{ - ph->env.cpuid = do_read_string(fd, ph); - return ph->env.cpuid ? 0 : -ENOMEM; -} - static int process_total_mem(struct perf_file_section *section __maybe_unused, struct perf_header *ph, int fd, void *data __maybe_unused)