From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759348Ab3K1LiZ (ORCPT ); Thu, 28 Nov 2013 06:38:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3452 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758957Ab3K1Lel (ORCPT ); Thu, 28 Nov 2013 06:34:41 -0500 From: Jiri Olsa To: linux-kernel@vger.kernel.org Cc: Jiri Olsa , Corey Ashford , Frederic Weisbecker , Ingo Molnar , Namhyung Kim , Paul Mackerras , Peter Zijlstra , Arnaldo Carvalho de Melo , Steven Rostedt , David Ahern Subject: [PATCH 20/29] tools lib traceevent: Remove malloc_or_die from plugin_function.c Date: Thu, 28 Nov 2013 12:33:19 +0100 Message-Id: <1385638408-23519-21-git-send-email-jolsa@redhat.com> In-Reply-To: <1385638408-23519-1-git-send-email-jolsa@redhat.com> References: <1385638408-23519-1-git-send-email-jolsa@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Removing malloc_or_die calls from plugin_function.c, replacing them with standard malloc and error path. Suggested-by: Namhyung Kim Signed-off-by: Jiri Olsa Cc: Corey Ashford Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Steven Rostedt Cc: David Ahern --- tools/lib/traceevent/plugin_function.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/lib/traceevent/plugin_function.c b/tools/lib/traceevent/plugin_function.c index 87acf9c..328d17d 100644 --- a/tools/lib/traceevent/plugin_function.c +++ b/tools/lib/traceevent/plugin_function.c @@ -44,10 +44,16 @@ static void add_child(struct func_stack *stack, const char *child, int pos) free(stack->stack[pos]); else { if (!stack->stack) - stack->stack = malloc_or_die(sizeof(char *) * STK_BLK); + stack->stack = malloc(sizeof(char *) * STK_BLK); else stack->stack = realloc(stack->stack, sizeof(char *) * (stack->size + STK_BLK)); + + if (!stack->stack) { + warning("could not allocate plugin memory\n"); + return; + } + for (i = stack->size; i < stack->size + STK_BLK; i++) stack->stack[i] = NULL; stack->size += STK_BLK; @@ -67,7 +73,12 @@ static int add_and_get_index(const char *parent, const char *child, int cpu) if (fstack) fstack = realloc(fstack, sizeof(*fstack) * (cpu + 1)); else - fstack = malloc_or_die(sizeof(*fstack) * (cpu + 1)); + fstack = malloc(sizeof(*fstack) * (cpu + 1)); + + if (!fstack) { + warning("could not allocate plugin memory\n"); + return 0; + } /* Account for holes in the cpu count */ for (i = cpus + 1; i <= cpu; i++) -- 1.8.3.1