From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753051Ab3K2Khk (ORCPT ); Fri, 29 Nov 2013 05:37:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4077 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752616Ab3K2Khi (ORCPT ); Fri, 29 Nov 2013 05:37:38 -0500 Date: Fri, 29 Nov 2013 11:37:07 +0100 From: Jiri Olsa To: Namhyung Kim Cc: linux-kernel@vger.kernel.org, Corey Ashford , Frederic Weisbecker , Ingo Molnar , Paul Mackerras , Peter Zijlstra , Arnaldo Carvalho de Melo , Steven Rostedt , David Ahern Subject: [PATCHv3 20/29] tools lib traceevent: Remove malloc_or_die from plugin_function.c Message-ID: <20131129103707.GB1231@krava.brq.redhat.com> References: <1385638408-23519-1-git-send-email-jolsa@redhat.com> <1385638408-23519-21-git-send-email-jolsa@redhat.com> <87eh5zpv5l.fsf@sejong.aot.lge.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87eh5zpv5l.fsf@sejong.aot.lge.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Nov 29, 2013 at 03:41:10PM +0900, Namhyung Kim wrote: > Hi Jiri, > > On Thu, 28 Nov 2013 12:33:19 +0100, Jiri Olsa wrote: > > 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)); > > I think single realloc() can handle both cases. And this code has a > problem that it overwrites stack->stack to NULL in case of error so that > we cannot point original region anymore. You'd better to use a temp > variable IMHO. right you are, please check v3 attached.. thanks, jirka --- Removing malloc_or_die calls from plugin_function.c, replacing them and factoring the code with standard realloc 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 | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/tools/lib/traceevent/plugin_function.c b/tools/lib/traceevent/plugin_function.c index 87acf9c..b43cade 100644 --- a/tools/lib/traceevent/plugin_function.c +++ b/tools/lib/traceevent/plugin_function.c @@ -43,11 +43,17 @@ static void add_child(struct func_stack *stack, const char *child, int pos) if (pos < stack->size) free(stack->stack[pos]); else { - if (!stack->stack) - stack->stack = malloc_or_die(sizeof(char *) * STK_BLK); - else - stack->stack = realloc(stack->stack, sizeof(char *) * - (stack->size + STK_BLK)); + char **ptr; + + ptr = realloc(stack->stack, sizeof(char *) * + (stack->size + STK_BLK)); + if (!ptr) { + warning("could not allocate plugin memory\n"); + return; + } + + stack->stack = ptr; + for (i = stack->size; i < stack->size + STK_BLK; i++) stack->stack[i] = NULL; stack->size += STK_BLK; @@ -64,10 +70,11 @@ static int add_and_get_index(const char *parent, const char *child, int cpu) return 0; if (cpu > cpus) { - if (fstack) - fstack = realloc(fstack, sizeof(*fstack) * (cpu + 1)); - else - fstack = malloc_or_die(sizeof(*fstack) * (cpu + 1)); + fstack = realloc(fstack, 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