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

Commit 36479484 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf tools: Introduce zalloc() for the common calloc(1, N) case 



This way we type less characters and it looks more like the
kzalloc kernel counterpart.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1259071517-3242-3-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b32d133a

tools/perf/bench/mem-memcpy.c

+2 −2
Original line number Diff line number Diff line
@@ -127,11 +127,11 @@ int bench_mem_memcpy(int argc, const char **argv, 
		return 1;

	}



	dst = calloc(length, sizeof(char));

	dst = zalloc(length);

	if (!dst)

		die("memory allocation failed - maybe length is too large?\n");



	src = calloc(length, sizeof(char));

	src = zalloc(length);

	if (!src)

		die("memory allocation failed - maybe length is too large?\n");

tools/perf/builtin-help.c

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static void add_man_viewer(const char *name) 


	while (*p)

		p = &((*p)->next);

	*p = calloc(1, (sizeof(**p) + len + 1));

	*p = zalloc(sizeof(**p) + len + 1);

	strncpy((*p)->name, name, len);

}
@@ -194,7 +194,7 @@ static void do_add_man_viewer_info(const char *name, 
				   size_t len,

				   const char *value)

{

	struct man_viewer_info_list *new = calloc(1, sizeof(*new) + len + 1);

	struct man_viewer_info_list *new = zalloc(sizeof(*new) + len + 1);



	strncpy(new->name, name, len);

	new->info = strdup(value);

tools/perf/builtin-probe.c

+2 −2
Original line number Diff line number Diff line
@@ -309,9 +309,9 @@ static int synthesize_probe_event(struct probe_point *pp) 
{

	char *buf;

	int i, len, ret;

	pp->probes[0] = buf = (char *)calloc(MAX_CMDLEN, sizeof(char));

	pp->probes[0] = buf = zalloc(MAX_CMDLEN);

	if (!buf)

		die("Failed to allocate memory by calloc.");

		die("Failed to allocate memory by zalloc.");

	ret = snprintf(buf, MAX_CMDLEN, "%s+%d", pp->function, pp->offset);

	if (ret <= 0 || ret >= MAX_CMDLEN)

		goto error;

tools/perf/builtin-sched.c

+5 −9
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static void calibrate_sleep_measurement_overhead(void) 
static struct sched_atom *

get_new_event(struct task_desc *task, u64 timestamp)

{

	struct sched_atom *event = calloc(1, sizeof(*event));

	struct sched_atom *event = zalloc(sizeof(*event));

	unsigned long idx = task->nr_events;

	size_t size;
@@ -293,7 +293,7 @@ add_sched_event_wakeup(struct task_desc *task, u64 timestamp, 
		return;

	}



	wakee_event->wait_sem = calloc(1, sizeof(*wakee_event->wait_sem));

	wakee_event->wait_sem = zalloc(sizeof(*wakee_event->wait_sem));

	sem_init(wakee_event->wait_sem, 0, 0);

	wakee_event->specific_wait = 1;

	event->wait_sem = wakee_event->wait_sem;
@@ -323,7 +323,7 @@ static struct task_desc *register_pid(unsigned long pid, const char *comm) 
	if (task)

		return task;



	task = calloc(1, sizeof(*task));

	task = zalloc(sizeof(*task));

	task->pid = pid;

	task->nr = nr_tasks;

	strcpy(task->comm, comm);
@@ -962,9 +962,7 @@ __thread_latency_insert(struct rb_root *root, struct work_atoms *data, 


static void thread_atoms_insert(struct thread *thread)

{

	struct work_atoms *atoms;



	atoms = calloc(sizeof(*atoms), 1);

	struct work_atoms *atoms = zalloc(sizeof(*atoms));

	if (!atoms)

		die("No memory");
@@ -996,9 +994,7 @@ add_sched_out_event(struct work_atoms *atoms, 
		    char run_state,

		    u64 timestamp)

{

	struct work_atom *atom;



	atom = calloc(sizeof(*atom), 1);

	struct work_atom *atom = zalloc(sizeof(*atom));

	if (!atom)

		die("Non memory");

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static void parse_source(struct sym_entry *syme) 
		return;



	if (syme->src == NULL) {

		syme->src = calloc(1, sizeof(*source));

		syme->src = zalloc(sizeof(*source));

		if (syme->src == NULL)

			return;

		pthread_mutex_init(&syme->src->lock, NULL);