Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7f01d1e authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Use scnprintf where applicable 



Several places were expecting that the value returned was the number of
characters printed, not what would be printed if there was space.

Fix it by using the scnprintf and vscnprintf variants we inherited from
the kernel sources.

Some corner cases where the number of printed characters were not
accounted were fixed too.

Reported-by: default avatarAnton Blanchard <anton@samba.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: Eric B Munson <emunson@mgebm.net>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Yanmin Zhang <yanmin_zhang@linux.intel.com>
Cc: stable@kernel.org
Link: http://lkml.kernel.org/n/tip-kwxo2eh29cxmd8ilixi2005x@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b832796c

tools/perf/arch/powerpc/util/header.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ get_cpuid(char *buffer, size_t sz) 


	pvr = mfspr(SPRN_PVR);



	nb = snprintf(buffer, sz, "%lu,%lu$", PVR_VER(pvr), PVR_REV(pvr));

	nb = scnprintf(buffer, sz, "%lu,%lu$", PVR_VER(pvr), PVR_REV(pvr));



	/* look for end marker to ensure the entire data fit */

	if (strchr(buffer, '$')) {

tools/perf/arch/x86/util/header.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ get_cpuid(char *buffer, size_t sz) 
		if (family >= 0x6)

			model += ((a >> 16) & 0xf) << 4;

	}

	nb = snprintf(buffer, sz, "%s,%u,%u,%u$", vendor, family, model, step);

	nb = scnprintf(buffer, sz, "%s,%u,%u,%u$", vendor, family, model, step);



	/* look for end marker to ensure the entire data fit */

	if (strchr(buffer, '$')) {

tools/perf/util/color.c

+5 −4
Original line number Diff line number Diff line 
#include <linux/kernel.h>

#include "cache.h"

#include "color.h"
@@ -182,12 +183,12 @@ static int __color_vsnprintf(char *bf, size_t size, const char *color, 
	}



	if (perf_use_color_default && *color)

		r += snprintf(bf, size, "%s", color);

	r += vsnprintf(bf + r, size - r, fmt, args);

		r += scnprintf(bf, size, "%s", color);

	r += vscnprintf(bf + r, size - r, fmt, args);

	if (perf_use_color_default && *color)

		r += snprintf(bf + r, size - r, "%s", PERF_COLOR_RESET);

		r += scnprintf(bf + r, size - r, "%s", PERF_COLOR_RESET);

	if (trail)

		r += snprintf(bf + r, size - r, "%s", trail);

		r += scnprintf(bf + r, size - r, "%s", trail);

	return r;

}

tools/perf/util/header.c

+2 −2
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir, 
	if (realname == NULL || filename == NULL || linkname == NULL)

		goto out_free;



	len = snprintf(filename, size, "%s%s%s",

	len = scnprintf(filename, size, "%s%s%s",

		       debugdir, is_kallsyms ? "/" : "", realname);

	if (mkdir_p(filename, 0755))

		goto out_free;
@@ -295,7 +295,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir, 
			goto out_free;

	}



	len = snprintf(linkname, size, "%s/.build-id/%.2s",

	len = scnprintf(linkname, size, "%s/.build-id/%.2s",

		       debugdir, sbuild_id);



	if (access(linkname, X_OK) && mkdir_p(linkname, 0755))

tools/perf/util/hist.c

+15 −15
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s, 
						     sep ? "%.2f" : "   %6.2f%%",

						     (period * 100.0) / total);

		else

			ret = snprintf(s, size, sep ? "%.2f" : "   %6.2f%%",

			ret = scnprintf(s, size, sep ? "%.2f" : "   %6.2f%%",

				       (period * 100.0) / total);

		if (symbol_conf.show_cpu_utilization) {

			ret += percent_color_snprintf(s + ret, size - ret,
@@ -791,20 +791,20 @@ static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s, 
			}

		}

	} else

		ret = snprintf(s, size, sep ? "%" PRIu64 : "%12" PRIu64 " ", period);

		ret = scnprintf(s, size, sep ? "%" PRIu64 : "%12" PRIu64 " ", period);



	if (symbol_conf.show_nr_samples) {

		if (sep)

			ret += snprintf(s + ret, size - ret, "%c%" PRIu64, *sep, nr_events);

			ret += scnprintf(s + ret, size - ret, "%c%" PRIu64, *sep, nr_events);

		else

			ret += snprintf(s + ret, size - ret, "%11" PRIu64, nr_events);

			ret += scnprintf(s + ret, size - ret, "%11" PRIu64, nr_events);

	}



	if (symbol_conf.show_total_period) {

		if (sep)

			ret += snprintf(s + ret, size - ret, "%c%" PRIu64, *sep, period);

			ret += scnprintf(s + ret, size - ret, "%c%" PRIu64, *sep, period);

		else

			ret += snprintf(s + ret, size - ret, " %12" PRIu64, period);

			ret += scnprintf(s + ret, size - ret, " %12" PRIu64, period);

	}



	if (pair_hists) {
@@ -819,25 +819,25 @@ static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s, 
		diff = new_percent - old_percent;



		if (fabs(diff) >= 0.01)

			snprintf(bf, sizeof(bf), "%+4.2F%%", diff);

			ret += scnprintf(bf, sizeof(bf), "%+4.2F%%", diff);

		else

			snprintf(bf, sizeof(bf), " ");

			ret += scnprintf(bf, sizeof(bf), " ");



		if (sep)

			ret += snprintf(s + ret, size - ret, "%c%s", *sep, bf);

			ret += scnprintf(s + ret, size - ret, "%c%s", *sep, bf);

		else

			ret += snprintf(s + ret, size - ret, "%11.11s", bf);

			ret += scnprintf(s + ret, size - ret, "%11.11s", bf);



		if (show_displacement) {

			if (displacement)

				snprintf(bf, sizeof(bf), "%+4ld", displacement);

				ret += scnprintf(bf, sizeof(bf), "%+4ld", displacement);

			else

				snprintf(bf, sizeof(bf), " ");

				ret += scnprintf(bf, sizeof(bf), " ");



			if (sep)

				ret += snprintf(s + ret, size - ret, "%c%s", *sep, bf);

				ret += scnprintf(s + ret, size - ret, "%c%s", *sep, bf);

			else

				ret += snprintf(s + ret, size - ret, "%6.6s", bf);

				ret += scnprintf(s + ret, size - ret, "%6.6s", bf);

		}

	}
@@ -855,7 +855,7 @@ int hist_entry__snprintf(struct hist_entry *he, char *s, size_t size, 
		if (se->elide)

			continue;



		ret += snprintf(s + ret, size - ret, "%s", sep ?: "  ");

		ret += scnprintf(s + ret, size - ret, "%s", sep ?: "  ");

		ret += se->se_snprintf(he, s + ret, size - ret,

				       hists__col_len(hists, se->se_width_idx));

	}