All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@kernel.org>,
	Namhyung Kim <namhyung.kim@lge.com>,
	LKML <linux-kernel@vger.kernel.org>,
	Frederic Weisbecker <fweisbec@gmail.com>
Subject: Re: [PATCH 3/9] perf util: Get rid of write_or_die() from trace-event-info.c
Date: Tue, 19 Mar 2013 10:35:11 -0400	[thread overview]
Message-ID: <1363703711.5938.20.camel@gandalf.local.home> (raw)
In-Reply-To: <1363683224-28804-4-git-send-email-namhyung@kernel.org>

On Tue, 2013-03-19 at 17:53 +0900, Namhyung Kim wrote:

>  struct tracing_data *tracing_data_get(struct list_head *pattrs,
> @@ -465,6 +516,7 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs,
>  {
>  	struct tracepoint_path *tps;
>  	struct tracing_data *tdata;
> +	int err1, err2, err3, err4, err5, err6;
>  
>  	output_fd = fd;
>  
> @@ -498,12 +550,12 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs,
>  		output_fd = temp_fd;
>  	}
>  
> -	tracing_data_header();
> -	read_header_files();
> -	read_ftrace_files(tps);
> -	read_event_files(tps);
> -	read_proc_kallsyms();
> -	read_ftrace_printk();
> +	err1 = tracing_data_header();
> +	err2 = read_header_files();
> +	err3 = read_ftrace_files(tps);
> +	err4 = read_event_files(tps);
> +	err5 = read_proc_kallsyms();
> +	err6 = read_ftrace_printk();

ugly ugly ugly

What about:
	int err = 0;

	err += tracing_data_header();
	err += read_header_files();
	[...]

	if (err < 0) {
		free(tdata);
		tdata = NULL;
	}

Also, is the only clean up needed be freeing tdata?

-- Steve


>  
>  	/*
>  	 * All tracing data are stored by now, we can restore
> @@ -515,22 +567,31 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs,
>  		output_fd = fd;
>  	}
>  
> +	if (err1 + err2 + err3 + err4 + err5 + err6 < 0) {
> +		free(tdata);
> +		tdata = NULL;
> +	}
> +
>  	put_tracepoints_path(tps);
>  	return tdata;
>  }
>  



  reply	other threads:[~2013-03-19 14:35 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-19  8:53 [PATCHSET 0/9] perf util: Cleanup die() and its friends Namhyung Kim
2013-03-19  8:53 ` [PATCH 1/9] perf util: Let get_tracing_file() can return NULL Namhyung Kim
2013-03-19 13:54   ` Steven Rostedt
2013-03-20  0:53     ` Namhyung Kim
2013-03-19  8:53 ` [PATCH 2/9] perf util: Get rid of malloc_or_die() in trace-event-info.c Namhyung Kim
2013-03-19  8:53 ` [PATCH 3/9] perf util: Get rid of write_or_die() from trace-event-info.c Namhyung Kim
2013-03-19 14:35   ` Steven Rostedt [this message]
2013-03-19 14:49     ` Peter Zijlstra
2013-03-19 14:59       ` Steven Rostedt
2013-03-19 15:04         ` Peter Zijlstra
2013-03-20  0:57           ` Namhyung Kim
2013-03-19  8:53 ` [PATCH 4/9] perf util: Get rid of die() calls " Namhyung Kim
2013-03-19  8:53 ` [PATCH 5/9] perf util: Handle failure case in trace_report() Namhyung Kim
2013-03-19 14:47   ` Steven Rostedt
2013-03-20  1:12     ` Namhyung Kim
2013-03-20  1:54       ` Steven Rostedt
2013-03-19  8:53 ` [PATCH 6/9] perf util: Get rid of malloc_or_die() in trace-event-read.c Namhyung Kim
2013-03-19 14:50   ` Steven Rostedt
2013-03-20  1:14     ` Namhyung Kim
2013-03-20  1:55       ` Steven Rostedt
2013-03-20  3:00         ` Namhyung Kim
2013-03-20  3:13           ` Steven Rostedt
2013-03-20 13:04             ` Arnaldo Carvalho de Melo
2013-03-19  8:53 ` [PATCH 7/9] perf util: Get rid of read_or_die() " Namhyung Kim
2013-03-19 14:54   ` Steven Rostedt
2013-03-20  1:24     ` Namhyung Kim
2013-03-20  1:59       ` Steven Rostedt
2013-03-19  8:53 ` [PATCH 8/9] perf util: Get rid of die() calls in trace-data-read.c Namhyung Kim
2013-03-19 14:55   ` Steven Rostedt
2013-03-20  1:25     ` Namhyung Kim
2013-03-20 13:27       ` Arnaldo Carvalho de Melo
2013-03-19  8:53 ` [PATCH 9/9] perf util: Cleanup calc_data_size logic Namhyung Kim
2013-03-21  7:18 [PATCHSET 0/9] perf util: Cleanup die() and its friends (v2) Namhyung Kim
2013-03-21  7:18 ` [PATCH 3/9] perf util: Get rid of write_or_die() from trace-event-info.c Namhyung Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1363703711.5938.20.camel@gandalf.local.home \
    --to=rostedt@goodmis.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@ghostprotocols.net \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung.kim@lge.com \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.