leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf tools: Change perf_mem__lvl_scnprintf to return nb of displayed bytes

Browse Source 
Moving strncat/strcpy calls into scnprintf to easily track number of
displayed bytes. It will be used in following patch.

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-11-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2016-02-24 09:46:51 +01:00 committed by Arnaldo Carvalho de Melo
parent b1a5fbea3d
commit 969075630e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/perf/util/mem-events.c
View File

@ -149,7 +149,7 @@ static const char * const mem_lvl[] = {
"Uncached",
};
void perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
int perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
{
size_t i, l = 0;
u64 m = PERF_MEM_LVL_NA;
@ -174,15 +174,16 @@ void perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
strcat(out, " or ");
l += 4;
}
strncat(out, mem_lvl[i], sz - l);
l += strlen(mem_lvl[i]);
l += scnprintf(out + l, sz - l, mem_lvl[i]);
}
if (*out == '\0')
strcpy(out, "N/A");
l += scnprintf(out, sz - l, "N/A");
if (hit)
strncat(out, " hit", sz - l);
l += scnprintf(out + l, sz - l, " hit");
if (miss)
strncat(out, " miss", sz - l);
l += scnprintf(out + l, sz - l, " miss");
return l;
}
static const char * const snoop_access[] = {

2
tools/perf/util/mem-events.h
View File

@ -26,7 +26,7 @@ char *perf_mem_events__name(int i);
struct mem_info;
int 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);
int 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);