perf tools: Introduce perf_mem__lck_scnprintf function
authorJiri Olsa <jolsa@kernel.org>
Wed, 24 Feb 2016 08:46:49 +0000 (09:46 +0100)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 24 Feb 2016 13:29:52 +0000 (10:29 -0300)
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
tools/perf/util/mem-events.h
tools/perf/util/sort.c

index d03edc2ec6073484deb202a1f61d93e5c9557d40..9844e3e36c1d6874cbd9814dc7c9d62961344ce3 100644 (file)
@@ -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);
+}
index 6efdd6fcdb017b13532b7fb75aa9dadbedaf9928..99678b51c747db7754312db61d50d19f95e96692 100644 (file)
@@ -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 */
index 2007c3b683f300ba588e312e79fdaeb089c3fe78..4175b2944ff99ccfe0ca1c230ae2c6ed2d5cd512 100644 (file)
@@ -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);
 }