Re: [PATCH 4/5] perf probe: Don't call die()

[Masami Hiramatsu]

Arnaldo Carvalho de Melo wrote:
> From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> 
> Functions that were calling xzalloc also returned -1 when, for other
> reasons, it could fail, and the calleds are coping with failures, so
> stop using die() and xzalloc().
> 

OK, but could you return -ENOMEM if failed to call zalloc()?

> Cc: FrÃdÃric Weisbecker <fweisbec@xxxxxxxxx>
> Cc: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
> Cc: Mike Galbraith <efault@xxxxxx>
> Cc: Paul Mackerras <paulus@xxxxxxxxx>
> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
> Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
> LKML-Reference: <new-submission>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> ---
>  tools/perf/builtin-probe.c |   10 +++++++---
>  1 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
> index 61c6d70..99b1728 100644
> --- a/tools/perf/builtin-probe.c
> +++ b/tools/perf/builtin-probe.c
> @@ -65,8 +65,10 @@ static int parse_probe_event(const char *str)
>  	int ret;
>  
>  	pr_debug("probe-definition(%d): %s\n", params.nevents, str);
> -	if (++params.nevents == MAX_PROBES)
> -		die("Too many probes (> %d) are specified.", MAX_PROBES);
> +	if (++params.nevents == MAX_PROBES) {
> +		pr_err("Too many probes (> %d) were specified.", MAX_PROBES);
> +		return -1;
> +	}
>  
>  	/* Parse a perf-probe command into event */
>  	ret = parse_perf_probe_command(str, pev);
> @@ -84,7 +86,9 @@ static int parse_probe_event_argv(int argc, const char **argv)
>  	len = 0;
>  	for (i = 0; i < argc; i++)
>  		len += strlen(argv[i]) + 1;
> -	buf = xzalloc(len + 1);
> +	buf = zalloc(len + 1);
> +	if (buf == NULL)
> +		return -1;
>  	len = 0;
>  	for (i = 0; i < argc; i++)
>  		len += sprintf(&buf[len], "%s ", argv[i]);

-- 
Masami Hiramatsu
e-mail: mhiramat@xxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/