Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1341655 > unrolled thread
| Started by | Jiri Olsa <jolsa@kernel.org> |
|---|---|
| First post | 2016-02-24 09:50 +0100 |
| Last post | 2016-02-25 08:40 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 08/15] perf tools: Introduce perf_mem__lck_scnprintf function Jiri Olsa <jolsa@kernel.org> - 2016-02-24 09:50 +0100
[tip:perf/core] perf tools: Introduce perf_mem__lck_scnprintf function tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-02-25 08:40 +0100
| From | Jiri Olsa <jolsa@kernel.org> |
|---|---|
| Date | 2016-02-24 09:50 +0100 |
| Subject | [PATCH 08/15] perf tools: Introduce perf_mem__lck_scnprintf function |
| Message-ID | <r5DiW-1S4-15@gated-at.bofh.it> |
Move meminfo's lck display function into mem-events.c
object, so it could be reused later from script code.
Link: http://lkml.kernel.org/n/tip-qiwjnu0m6vzknv25t5ggund6@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/mem-events.c | 16 ++++++++++++++++
tools/perf/util/mem-events.h | 2 ++
tools/perf/util/sort.c | 14 ++------------
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
index aacd16a670c8..3b16128234b7 100644
--- a/tools/perf/util/mem-events.c
+++ b/tools/perf/util/mem-events.c
@@ -232,3 +232,19 @@ void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
if (*out == '\0')
strcpy(out, "N/A");
}
+
+void perf_mem__lck_scnprintf(char *out, size_t sz __maybe_unused,
+ struct mem_info *mem_info)
+{
+ u64 mask = PERF_MEM_LOCK_NA;
+
+ if (mem_info)
+ mask = mem_info->data_src.mem_lock;
+
+ if (mask & PERF_MEM_LOCK_NA)
+ strncat(out, "N/A", 3);
+ else if (mask & PERF_MEM_LOCK_LOCKED)
+ strncat(out, "Yes", 3);
+ else
+ strncat(out, "No", 2);
+}
diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
index 6f8ea2f8107b..06750f640586 100644
--- a/tools/perf/util/mem-events.h
+++ b/tools/perf/util/mem-events.h
@@ -29,4 +29,6 @@ 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);
+void perf_mem__lck_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 2007c3b683f3..4175b2944ff9 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -795,19 +795,9 @@ sort__locked_cmp(struct hist_entry *left, struct hist_entry *right)
static int hist_entry__locked_snprintf(struct hist_entry *he, char *bf,
size_t size, unsigned int width)
{
- const char *out;
- u64 mask = PERF_MEM_LOCK_NA;
-
- if (he->mem_info)
- mask = he->mem_info->data_src.mem_lock;
-
- if (mask & PERF_MEM_LOCK_NA)
- out = "N/A";
- else if (mask & PERF_MEM_LOCK_LOCKED)
- out = "Yes";
- else
- out = "No";
+ char out[10];
+ perf_mem__lck_scnprintf(out, sizeof(out), he->mem_info);
return repsep_snprintf(bf, size, "%.*s", width, out);
}
--
2.4.3
[toc] | [next] | [standalone]
| From | tip-bot for Jiri Olsa <tipbot@zytor.com> |
|---|---|
| Date | 2016-02-25 08:40 +0100 |
| Subject | [tip:perf/core] perf tools: Introduce perf_mem__lck_scnprintf function |
| Message-ID | <r5YGK-qv-25@gated-at.bofh.it> |
| In reply to | #1341655 |
Commit-ID: 69a77275926ccd0c08fde103de52b59f18370f5a
Gitweb: http://git.kernel.org/tip/69a77275926ccd0c08fde103de52b59f18370f5a
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Wed, 24 Feb 2016 09:46:49 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 24 Feb 2016 10:29:52 -0300
perf tools: Introduce perf_mem__lck_scnprintf function
Move meminfo's lck display function into mem-events.c object, so it
could be reused later from script code.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1456303616-26926-9-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/mem-events.c | 16 ++++++++++++++++
tools/perf/util/mem-events.h | 2 ++
tools/perf/util/sort.c | 14 ++------------
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
index d03edc2..9844e3e 100644
--- a/tools/perf/util/mem-events.c
+++ b/tools/perf/util/mem-events.c
@@ -217,3 +217,19 @@ void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
if (*out == '\0')
strcpy(out, "N/A");
}
+
+void perf_mem__lck_scnprintf(char *out, size_t sz __maybe_unused,
+ struct mem_info *mem_info)
+{
+ u64 mask = PERF_MEM_LOCK_NA;
+
+ if (mem_info)
+ mask = mem_info->data_src.mem_lock;
+
+ if (mask & PERF_MEM_LOCK_NA)
+ strncat(out, "N/A", 3);
+ else if (mask & PERF_MEM_LOCK_LOCKED)
+ strncat(out, "Yes", 3);
+ else
+ strncat(out, "No", 2);
+}
diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
index 6efdd6f..99678b5 100644
--- a/tools/perf/util/mem-events.h
+++ b/tools/perf/util/mem-events.h
@@ -28,4 +28,6 @@ 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);
+void perf_mem__lck_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 2007c3b..4175b29 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -795,19 +795,9 @@ sort__locked_cmp(struct hist_entry *left, struct hist_entry *right)
static int hist_entry__locked_snprintf(struct hist_entry *he, char *bf,
size_t size, unsigned int width)
{
- const char *out;
- u64 mask = PERF_MEM_LOCK_NA;
-
- if (he->mem_info)
- mask = he->mem_info->data_src.mem_lock;
-
- if (mask & PERF_MEM_LOCK_NA)
- out = "N/A";
- else if (mask & PERF_MEM_LOCK_LOCKED)
- out = "Yes";
- else
- out = "No";
+ char out[10];
+ perf_mem__lck_scnprintf(out, sizeof(out), he->mem_info);
return repsep_snprintf(bf, size, "%.*s", width, out);
}
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web