Commit 91b98804 authored Jan 30, 2013 by Paul Gortmaker Committed by Arnaldo Carvalho de Melo Feb 06, 2013

perf tools: Fix calloc argument ordering



A sweep of the kernel for regex "kcalloc(sizeof" turned up 2 reversed
args, fixed in commit d3d09e18 ("EDAC:
Fix kcalloc argument order") and also fixed in the networking commit
a1b1add0 ("gro: Fix kcalloc argument
order").

I know that was the regex used, because on seeing the 1st of these
changes, I wondered "how many other instances of this are there" and I
happened to just use "calloc(sizeof" as a regex and it in turn found
these additional reversed args instances in the perf code.

In the kcalloc cases, the changes are cosmetic, since the numbers are
simply multiplied.  I had no desire to go data mining in userspace to
see if the same thing held true there, however.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Joe Perches <joe@perches.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1359594349-25912-1-git-send-email-paul.gortmaker@windriver.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 5a30a99f

tools/perf/util/callchain.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -444,7 +444,7 @@ int callchain_cursor_append(struct callchain_cursor *cursor,
		struct callchain_cursor_node node = cursor->last;

		if (!node) {
		node = calloc(sizeof(*node), 1);
		node = calloc(1, sizeof(*node));
		if (!node)
		return -ENOMEM;

tools/perf/util/header.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2253,7 +2253,7 @@ static int perf_header__adds_write(struct perf_header *header,
		if (!nr_sections)
		return 0;

		feat_sec = p = calloc(sizeof(*feat_sec), nr_sections);
		feat_sec = p = calloc(nr_sections, sizeof(*feat_sec));
		if (feat_sec == NULL)
		return -ENOMEM;

		@@ -2425,7 +2425,7 @@ int perf_header__process_sections(struct perf_header *header, int fd,
		if (!nr_sections)
		return 0;

		feat_sec = sec = calloc(sizeof(*feat_sec), nr_sections);
		feat_sec = sec = calloc(nr_sections, sizeof(*feat_sec));
		if (!feat_sec)
		return -1;

Admin message