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

Commit 18423d35 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 *  Fix numa topology printing, from Namhyung Kim.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 0d855354 f787d951

tools/perf/util/header.c

+2 −0
Original line number Diff line number Diff line
@@ -1378,6 +1378,8 @@ static void print_numa_topology(struct perf_header *ph, int fd __maybe_unused, 


		str = tmp + 1;

		fprintf(fp, "# node%u cpu list : %s\n", c, str);



		str += strlen(str) + 1;

	}

	return;

error:

tools/perf/util/strbuf.c

+4 −4
Original line number Diff line number Diff line
@@ -90,17 +90,17 @@ void strbuf_addf(struct strbuf *sb, const char *fmt, ...) 
	if (!strbuf_avail(sb))

		strbuf_grow(sb, 64);

	va_start(ap, fmt);

	len = vscnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);

	len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);

	va_end(ap);

	if (len < 0)

		die("your vscnprintf is broken");

		die("your vsnprintf is broken");

	if (len > strbuf_avail(sb)) {

		strbuf_grow(sb, len);

		va_start(ap, fmt);

		len = vscnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);

		len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);

		va_end(ap);

		if (len > strbuf_avail(sb)) {

			die("this should not happen, your snprintf is broken");

			die("this should not happen, your vsnprintf is broken");

		}

	}

	strbuf_setlen(sb, sb->len + len);