Commit 149d7507 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

perf tools: Change perf_mem__snp_scnprintf to return nb of displayed bytes

Moving strncat/strcpy calls into scnprintf to easily track number of
displayed bytes. It will be used in following patch.
Signed-off-by: default avatarJiri 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-12-git-send-email-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 96907563
...@@ -194,7 +194,7 @@ static const char * const snoop_access[] = { ...@@ -194,7 +194,7 @@ static const char * const snoop_access[] = {
"HitM", "HitM",
}; };
void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info) int perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
{ {
size_t i, l = 0; size_t i, l = 0;
u64 m = PERF_MEM_SNOOP_NA; u64 m = PERF_MEM_SNOOP_NA;
...@@ -212,12 +212,13 @@ void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info) ...@@ -212,12 +212,13 @@ void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
strcat(out, " or "); strcat(out, " or ");
l += 4; l += 4;
} }
strncat(out, snoop_access[i], sz - l); l += scnprintf(out + l, sz - l, snoop_access[i]);
l += strlen(snoop_access[i]);
} }
if (*out == '\0') if (*out == '\0')
strcpy(out, "N/A"); l += scnprintf(out, sz - l, "N/A");
return l;
} }
void perf_mem__lck_scnprintf(char *out, size_t sz __maybe_unused, void perf_mem__lck_scnprintf(char *out, size_t sz __maybe_unused,
......
...@@ -27,7 +27,7 @@ char *perf_mem_events__name(int i); ...@@ -27,7 +27,7 @@ char *perf_mem_events__name(int i);
struct mem_info; struct mem_info;
int perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info); int perf_mem__tlb_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); 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); int 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); void perf_mem__lck_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
#endif /* __PERF_MEM_EVENTS_H */ #endif /* __PERF_MEM_EVENTS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment