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

[tip-bot for Jiri Olsa]

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

perf tools: Introduce perf_mem__tlb_scnprintf function

Move meminfo's tlb 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-6-git-send-email-jo...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/util/mem-events.c | 47 
 tools/perf/util/mem-events.h |  3 +++
 tools/perf/util/sort.c   | 44 ++---
 3 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
index 2330db5..4be3eb7 100644
--- a/tools/perf/util/mem-events.c
+++ b/tools/perf/util/mem-events.c
@@ -8,6 +8,7 @@
 #include 
 #include "mem-events.h"
 #include "debug.h"
+#include "symbol.h"
 
 #define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s }
 
@@ -83,3 +84,49 @@ int perf_mem_events__init(void)
 
return found ? 0 : -ENOENT;
 }
+
+static const char * const tlb_access[] = {
+   "N/A",
+   "HIT",
+   "MISS",
+   "L1",
+   "L2",
+   "Walker",
+   "Fault",
+};
+
+void perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
+{
+   size_t l = 0, i;
+   u64 m = PERF_MEM_TLB_NA;
+   u64 hit, miss;
+
+   sz -= 1; /* -1 for null termination */
+   out[0] = '\0';
+
+   if (mem_info)
+   m = mem_info->data_src.mem_dtlb;
+
+   hit = m & PERF_MEM_TLB_HIT;
+   miss = m & PERF_MEM_TLB_MISS;
+
+   /* already taken care of */
+   m &= ~(PERF_MEM_TLB_HIT|PERF_MEM_TLB_MISS);
+
+   for (i = 0; m && i < ARRAY_SIZE(tlb_access); i++, m >>= 1) {
+   if (!(m & 0x1))
+   continue;
+   if (l) {
+   strcat(out, " or ");
+   l += 4;
+   }
+   strncat(out, tlb_access[i], sz - l);
+   l += strlen(tlb_access[i]);
+   }
+   if (*out == '\0')
+   strcpy(out, "N/A");
+   if (hit)
+   strncat(out, " hit", sz - l);
+   if (miss)
+   strncat(out, " miss", sz - l);
+}
diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
index 2a91b95..d8fb8e1 100644
--- a/tools/perf/util/mem-events.h
+++ b/tools/perf/util/mem-events.h
@@ -23,4 +23,7 @@ int perf_mem_events__parse(const char *str);
 int perf_mem_events__init(void);
 
 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);
 #endif /* __PERF_MEM_EVENTS_H */
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 5388f79..160df20 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -6,6 +6,7 @@
 #include "evsel.h"
 #include "evlist.h"
 #include 
+#include "mem-events.h"
 
 regex_tparent_regex;
 const char default_parent_pattern[] = "^sys_|^do_page_fault";
@@ -829,53 +830,12 @@ sort__tlb_cmp(struct hist_entry *left, struct hist_entry 
*right)
return (int64_t)(data_src_r.mem_dtlb - data_src_l.mem_dtlb);
 }
 
-static const char * const tlb_access[] = {
-   "N/A",
-   "HIT",
-   "MISS",
-   "L1",
-   "L2",
-   "Walker",
-   "Fault",
-};
-
 static int hist_entry__tlb_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 l = 0, i;
-   u64 m = PERF_MEM_TLB_NA;
-   u64 hit, miss;
-
-   out[0] = '\0';
-
-   if (he->mem_info)
-   m = he->mem_info->data_src.mem_dtlb;
-
-   hit = m & PERF_MEM_TLB_HIT;
-   miss = m & PERF_MEM_TLB_MISS;
-
-   /* already taken care of */
-   m &= ~(PERF_MEM_TLB_HIT|PERF_MEM_TLB_MISS);
-
-   for (i = 0; m && i < ARRAY_SIZE(tlb_access); i++, m >>= 1) {
-   if (!(m & 0x1))
-   continue;
-   if (l) {
-   strcat(out, " or ");
-   l += 4;
-   }
-   strncat(out, tlb_access[i], sz - l);
-   l += strlen(tlb_access[i]);
-   }
-   if (*out == '\0')
-   strcpy(out, "N/A");
-   if (hit)
-   strncat(out, " hit", sz - l);
-   if (miss)
-   strncat(out, " miss", sz - l);
 
+   

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

[tip-bot for Jiri Olsa]

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

perf tools: Introduce perf_mem__tlb_scnprintf function

Move meminfo's tlb 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-6-git-send-email-jo...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/util/mem-events.c | 47 
 tools/perf/util/mem-events.h |  3 +++
 tools/perf/util/sort.c   | 44 ++---
 3 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
index 2330db5..4be3eb7 100644
--- a/tools/perf/util/mem-events.c
+++ b/tools/perf/util/mem-events.c
@@ -8,6 +8,7 @@
 #include 
 #include "mem-events.h"
 #include "debug.h"
+#include "symbol.h"
 
 #define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s }
 
@@ -83,3 +84,49 @@ int perf_mem_events__init(void)
 
return found ? 0 : -ENOENT;
 }
+
+static const char * const tlb_access[] = {
+   "N/A",
+   "HIT",
+   "MISS",
+   "L1",
+   "L2",
+   "Walker",
+   "Fault",
+};
+
+void perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
+{
+   size_t l = 0, i;
+   u64 m = PERF_MEM_TLB_NA;
+   u64 hit, miss;
+
+   sz -= 1; /* -1 for null termination */
+   out[0] = '\0';
+
+   if (mem_info)
+   m = mem_info->data_src.mem_dtlb;
+
+   hit = m & PERF_MEM_TLB_HIT;
+   miss = m & PERF_MEM_TLB_MISS;
+
+   /* already taken care of */
+   m &= ~(PERF_MEM_TLB_HIT|PERF_MEM_TLB_MISS);
+
+   for (i = 0; m && i < ARRAY_SIZE(tlb_access); i++, m >>= 1) {
+   if (!(m & 0x1))
+   continue;
+   if (l) {
+   strcat(out, " or ");
+   l += 4;
+   }
+   strncat(out, tlb_access[i], sz - l);
+   l += strlen(tlb_access[i]);
+   }
+   if (*out == '\0')
+   strcpy(out, "N/A");
+   if (hit)
+   strncat(out, " hit", sz - l);
+   if (miss)
+   strncat(out, " miss", sz - l);
+}
diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
index 2a91b95..d8fb8e1 100644
--- a/tools/perf/util/mem-events.h
+++ b/tools/perf/util/mem-events.h
@@ -23,4 +23,7 @@ int perf_mem_events__parse(const char *str);
 int perf_mem_events__init(void);
 
 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);
 #endif /* __PERF_MEM_EVENTS_H */
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 5388f79..160df20 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -6,6 +6,7 @@
 #include "evsel.h"
 #include "evlist.h"
 #include 
+#include "mem-events.h"
 
 regex_tparent_regex;
 const char default_parent_pattern[] = "^sys_|^do_page_fault";
@@ -829,53 +830,12 @@ sort__tlb_cmp(struct hist_entry *left, struct hist_entry 
*right)
return (int64_t)(data_src_r.mem_dtlb - data_src_l.mem_dtlb);
 }
 
-static const char * const tlb_access[] = {
-   "N/A",
-   "HIT",
-   "MISS",
-   "L1",
-   "L2",
-   "Walker",
-   "Fault",
-};
-
 static int hist_entry__tlb_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 l = 0, i;
-   u64 m = PERF_MEM_TLB_NA;
-   u64 hit, miss;
-
-   out[0] = '\0';
-
-   if (he->mem_info)
-   m = he->mem_info->data_src.mem_dtlb;
-
-   hit = m & PERF_MEM_TLB_HIT;
-   miss = m & PERF_MEM_TLB_MISS;
-
-   /* already taken care of */
-   m &= ~(PERF_MEM_TLB_HIT|PERF_MEM_TLB_MISS);
-
-   for (i = 0; m && i < ARRAY_SIZE(tlb_access); i++, m >>= 1) {
-   if (!(m & 0x1))
-   continue;
-   if (l) {
-   strcat(out, " or ");
-   l += 4;
-   }
-   strncat(out, tlb_access[i], sz - l);
-   l += strlen(tlb_access[i]);
-   }
-   if (*out == '\0')
-   strcpy(out, "N/A");
-   if (hit)
-   strncat(out, " hit", sz - l);
-   if (miss)
-   strncat(out, " miss", sz - l);
 
+   perf_mem__tlb_scnprintf(out, sizeof(out), he->mem_info);
return repsep_snprintf(bf, size, "%-*s", width, out);
 }