Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1658411

[PATCH v3 02/15] perf header: add PROCESS_STR_FUN macro

Show all headers | View raw

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 <davidcc@google.com>
---
 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 afd1316f6b51..2ed830c9283f 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1594,6 +1594,23 @@ static int perf_header__read_build_ids(struct perf_header *header,
 	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)
@@ -1611,38 +1628,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)
@@ -1662,22 +1647,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)
-- 
2.13.1.508.gb3defc5cc-goog

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 00/15] perf tool: add meta-data header support for pipe-mode David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:10 +0200
  [PATCH v3 14/15] perf tools: add feature header record to pipe-mode David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:10 +0200
  [PATCH v3 09/15] perf header: use struct feat_fd in read header records David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:10 +0200
  [PATCH v3 10/15] perf header: make write_pmu_mappings pipe-mode friendly David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:10 +0200
  [PATCH v3 02/15] perf header: add PROCESS_STR_FUN macro David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:10 +0200
  [PATCH v3 05/15] perf header: revamp do_write David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:10 +0200
  [PATCH v3 13/15] perf tool: add show_feature_header to perf_tool David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:10 +0200
  [PATCH v3 03/15] perf header: fail on write_padded error David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:20 +0200
  [PATCH v3 08/15] perf header: use struct feat_fd to process header records David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:20 +0200
  [PATCH v3 04/15] perf util: add const modifier to buf in "writen" function David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:20 +0200
  [PATCH v3 06/15] perf header: add struct feat_fd for write David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:20 +0200
  [PATCH v3 01/15] perf header: encapsulate read and swap David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:20 +0200
  [PATCH v3 12/15] perf header: change FEAT_OP* macros David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 09:20 +0200
  Re: [PATCH v3 00/15] perf tool: add meta-data header support for  pipe-mode Jiri Olsa <jolsa@redhat.com> - 2017-06-06 14:40 +0200
    Re: [PATCH v3 00/15] perf tool: add meta-data header support for pipe-mode David Carrillo-Cisneros <davidcc@google.com> - 2017-06-06 20:20 +0200
      Re: [PATCH v3 00/15] perf tool: add meta-data header support for  pipe-mode Jiri Olsa <jolsa@redhat.com> - 2017-06-07 13:30 +0200
        Re: [PATCH v3 00/15] perf tool: add meta-data header support for pipe-mode David Carrillo-Cisneros <davidcc@google.com> - 2017-06-07 17:10 +0200

csiph-web