lkml.org 
[lkml]   [2013]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 22/28] tools lib traceevent: Remove malloc_or_die from event-plugin.c
On Tue, Dec 03, 2013 at 11:16:01AM -0500, Steven Rostedt wrote:
> On Tue, 3 Dec 2013 14:09:36 +0100
> Jiri Olsa <jolsa@redhat.com> wrote:
>
> > Removing malloc_or_die calls from event-plugin.c,
> > replacing them with standard malloc and error path.
> >
> > Suggested-by: Namhyung Kim <namhyung@kernel.org>
> > Signed-off-by: Jiri Olsa <jolsa@redhat.com>
> > Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
> > Cc: Frederic Weisbecker <fweisbec@gmail.com>
> > Cc: Ingo Molnar <mingo@elte.hu>
> > Cc: Namhyung Kim <namhyung@kernel.org>
> > Cc: Paul Mackerras <paulus@samba.org>
> > Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
> > Cc: Steven Rostedt <rostedt@goodmis.org>
> > Cc: David Ahern <dsahern@gmail.com>
> > ---
> > tools/lib/traceevent/event-plugin.c | 19 ++++++++++++++++---
> > 1 file changed, 16 insertions(+), 3 deletions(-)
> >
> > diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c
> > index d272d87..125f567 100644
> > --- a/tools/lib/traceevent/event-plugin.c
> > +++ b/tools/lib/traceevent/event-plugin.c
> > @@ -47,7 +47,11 @@ load_plugin(struct pevent *pevent, const char *path,
> > char *plugin;
> > void *handle;
> >
> > - plugin = malloc_or_die(strlen(path) + strlen(file) + 2);
> > + plugin = malloc(strlen(path) + strlen(file) + 2);
> > + if (!plugin) {
> > + warning("could not allocate plugin memory\n");
> > + return;
>
> This should be changed to return an error code. Yes it will require
> other places to change for that update as well.

Any chance this could be a separated feature? ;-)

AFACIS there's no technical problem with the current code.
If the load_plugin fails (due to ENOMEM or interface error)
it's not added on the plugin_list, which is the output/handle
of plugin interface (and there's warning ;-)).

I think we need some complex/unified error handling for the
whole library and add that globally.

jirka


\
 
 \ /
  Last update: 2013-12-04 12:21    [W:0.913 / U:0.144 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site