[tip:perf/core] perf tools: Introduce perf_mem__snp_scnprintf function

[tip-bot for Jiri Olsa]

Commit-ID:  2c07af13dcd4d971578041b50598f1269b33e68a
Gitweb: http://git.kernel.org/tip/2c07af13dcd4d971578041b50598f1269b33e68a
Author: Jiri Olsa 
AuthorDate: Wed, 24 Feb 2016 09:46:48 +0100
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Wed, 24 Feb 2016 10:20:45 -0300

perf tools: Introduce perf_mem__snp_scnprintf function

Move meminfo's snp display function into mem-events.c object, so it
could be reused later from script code.

Signed-off-by: Jiri Olsa 
Cc: Andi Kleen 
Cc: David Ahern 
Cc: Namhyung Kim 
Cc: Peter Zijlstra 
Cc: Stephane Eranian 
Link: 
http://lkml.kernel.org/r/1456303616-26926-8-git-send-email-jo...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/util/mem-events.c | 34 ++
 tools/perf/util/mem-events.h |  1 +
 tools/perf/util/sort.c   | 31 +--
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
index bddb121..d03edc2 100644
--- a/tools/perf/util/mem-events.c
+++ b/tools/perf/util/mem-events.c
@@ -183,3 +183,37 @@ void perf_mem__lvl_scnprintf(char *out, size_t sz, struct 
mem_info *mem_info)
if (miss)
strncat(out, " miss", sz - l);
 }
+
+static const char * const snoop_access[] = {
+   "N/A",
+   "None",
+   "Miss",
+   "Hit",
+   "HitM",
+};
+
+void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
+{
+   size_t i, l = 0;
+   u64 m = PERF_MEM_SNOOP_NA;
+
+   sz -= 1; /* -1 for null termination */
+   out[0] = '\0';
+
+   if (mem_info)
+   m = mem_info->data_src.mem_snoop;
+
+   for (i = 0; m && i < ARRAY_SIZE(snoop_access); i++, m >>= 1) {
+   if (!(m & 0x1))
+   continue;
+   if (l) {
+   strcat(out, " or ");
+   l += 4;
+   }
+   strncat(out, snoop_access[i], sz - l);
+   l += strlen(snoop_access[i]);
+   }
+
+   if (*out == '\0')
+   strcpy(out, "N/A");
+}
diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
index bd0d7f7..6efdd6f 100644
--- a/tools/perf/util/mem-events.h
+++ b/tools/perf/util/mem-events.h
@@ -27,4 +27,5 @@ char *perf_mem_events__name(int i);
 struct mem_info;
 void perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
 void perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
+void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
 #endif /* __PERF_MEM_EVENTS_H */
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index d894759..2007c3b 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -886,41 +886,12 @@ sort__snoop_cmp(struct hist_entry *left, struct 
hist_entry *right)
return (int64_t)(data_src_r.mem_snoop - data_src_l.mem_snoop);
 }
 
-static const char * const snoop_access[] = {
-   "N/A",
-   "None",
-   "Miss",
-   "Hit",
-   "HitM",
-};
-
 static int hist_entry__snoop_snprintf(struct hist_entry *he, char *bf,
size_t size, unsigned int width)
 {
char out[64];
-   size_t sz = sizeof(out) - 1; /* -1 for null termination */
-   size_t i, l = 0;
-   u64 m = PERF_MEM_SNOOP_NA;
-
-   out[0] = '\0';
-
-   if (he->mem_info)
-   m = he->mem_info->data_src.mem_snoop;
-
-   for (i = 0; m && i < ARRAY_SIZE(snoop_access); i++, m >>= 1) {
-   if (!(m & 0x1))
-   continue;
-   if (l) {
-   strcat(out, " or ");
-   l += 4;
-   }
-   strncat(out, snoop_access[i], sz - l);
-   l += strlen(snoop_access[i]);
-   }
-
-   if (*out == '\0')
-   strcpy(out, "N/A");
 
+   perf_mem__snp_scnprintf(out, sizeof(out), he->mem_info);
return repsep_snprintf(bf, size, "%-*s", width, out);
 }
 

[tip:perf/core] perf tools: Introduce perf_mem__snp_scnprintf function

[tip-bot for Jiri Olsa]

Commit-ID:  2c07af13dcd4d971578041b50598f1269b33e68a
Gitweb: http://git.kernel.org/tip/2c07af13dcd4d971578041b50598f1269b33e68a
Author: Jiri Olsa 
AuthorDate: Wed, 24 Feb 2016 09:46:48 +0100
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Wed, 24 Feb 2016 10:20:45 -0300

perf tools: Introduce perf_mem__snp_scnprintf function

Move meminfo's snp display function into mem-events.c object, so it
could be reused later from script code.

Signed-off-by: Jiri Olsa 
Cc: Andi Kleen 
Cc: David Ahern 
Cc: Namhyung Kim 
Cc: Peter Zijlstra 
Cc: Stephane Eranian 
Link: 
http://lkml.kernel.org/r/1456303616-26926-8-git-send-email-jo...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/util/mem-events.c | 34 ++
 tools/perf/util/mem-events.h |  1 +
 tools/perf/util/sort.c   | 31 +--
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
index bddb121..d03edc2 100644
--- a/tools/perf/util/mem-events.c
+++ b/tools/perf/util/mem-events.c
@@ -183,3 +183,37 @@ void perf_mem__lvl_scnprintf(char *out, size_t sz, struct 
mem_info *mem_info)
if (miss)
strncat(out, " miss", sz - l);
 }
+
+static const char * const snoop_access[] = {
+   "N/A",
+   "None",
+   "Miss",
+   "Hit",
+   "HitM",
+};
+
+void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
+{
+   size_t i, l = 0;
+   u64 m = PERF_MEM_SNOOP_NA;
+
+   sz -= 1; /* -1 for null termination */
+   out[0] = '\0';
+
+   if (mem_info)
+   m = mem_info->data_src.mem_snoop;
+
+   for (i = 0; m && i < ARRAY_SIZE(snoop_access); i++, m >>= 1) {
+   if (!(m & 0x1))
+   continue;
+   if (l) {
+   strcat(out, " or ");
+   l += 4;
+   }
+   strncat(out, snoop_access[i], sz - l);
+   l += strlen(snoop_access[i]);
+   }
+
+   if (*out == '\0')
+   strcpy(out, "N/A");
+}
diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
index bd0d7f7..6efdd6f 100644
--- a/tools/perf/util/mem-events.h
+++ b/tools/perf/util/mem-events.h
@@ -27,4 +27,5 @@ char *perf_mem_events__name(int i);
 struct mem_info;
 void perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
 void perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
+void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
 #endif /* __PERF_MEM_EVENTS_H */
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index d894759..2007c3b 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -886,41 +886,12 @@ sort__snoop_cmp(struct hist_entry *left, struct 
hist_entry *right)
return (int64_t)(data_src_r.mem_snoop - data_src_l.mem_snoop);
 }
 
-static const char * const snoop_access[] = {
-   "N/A",
-   "None",
-   "Miss",
-   "Hit",
-   "HitM",
-};
-
 static int hist_entry__snoop_snprintf(struct hist_entry *he, char *bf,
size_t size, unsigned int width)
 {
char out[64];
-   size_t sz = sizeof(out) - 1; /* -1 for null termination */
-   size_t i, l = 0;
-   u64 m = PERF_MEM_SNOOP_NA;
-
-   out[0] = '\0';
-
-   if (he->mem_info)
-   m = he->mem_info->data_src.mem_snoop;
-
-   for (i = 0; m && i < ARRAY_SIZE(snoop_access); i++, m >>= 1) {
-   if (!(m & 0x1))
-   continue;
-   if (l) {
-   strcat(out, " or ");
-   l += 4;
-   }
-   strncat(out, snoop_access[i], sz - l);
-   l += strlen(snoop_access[i]);
-   }
-
-   if (*out == '\0')
-   strcpy(out, "N/A");
 
+   perf_mem__snp_scnprintf(out, sizeof(out), he->mem_info);
return repsep_snprintf(bf, size, "%-*s", width, out);
 }