Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932924Ab3CTDN3 (ORCPT ); Tue, 19 Mar 2013 23:13:29 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:10781 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932150Ab3CTDN2 (ORCPT ); Tue, 19 Mar 2013 23:13:28 -0400 X-Authority-Analysis: v=2.0 cv=H5hZMpki c=1 sm=0 a=rXTBtCOcEpjy1lPqhTCpEQ==:17 a=mNMOxpOpBa8A:10 a=c2tSGNMr5iYA:10 a=5SG0PmZfjMsA:10 a=IkcTkHD0fZMA:10 a=meVymXHHAAAA:8 a=SbTfxjnowbEA:10 a=nR5f1fUsjioDoUop7s4A:9 a=QEXdDO2ut3YA:10 a=rXTBtCOcEpjy1lPqhTCpEQ==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 74.67.115.198 Message-ID: <1363749205.6345.5.camel@gandalf.local.home> Subject: Re: [PATCH 6/9] perf util: Get rid of malloc_or_die() in trace-event-read.c From: Steven Rostedt To: Namhyung Kim Cc: Arnaldo Carvalho de Melo , Peter Zijlstra , Paul Mackerras , Ingo Molnar , Namhyung Kim , LKML , Frederic Weisbecker Date: Tue, 19 Mar 2013 23:13:25 -0400 In-Reply-To: <871ubaixlw.fsf@sejong.aot.lge.com> References: <1363683224-28804-1-git-send-email-namhyung@kernel.org> <1363683224-28804-7-git-send-email-namhyung@kernel.org> <1363704602.5938.26.camel@gandalf.local.home> <87ehfaj2ic.fsf@sejong.aot.lge.com> <1363744502.6345.1.camel@gandalf.local.home> <871ubaixlw.fsf@sejong.aot.lge.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.4.4-2 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1562 Lines: 42 On Wed, 2013-03-20 at 12:00 +0900, Namhyung Kim wrote: > On Tue, 19 Mar 2013 21:55:02 -0400, Steven Rostedt wrote: > > On Wed, 2013-03-20 at 10:14 +0900, Namhyung Kim wrote: > >> On Tue, 19 Mar 2013 10:50:02 -0400, Steven Rostedt wrote: > >> > On Tue, 2013-03-19 at 17:53 +0900, Namhyung Kim wrote: > >> >> free(version); > >> >> @@ -331,11 +354,12 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe) > >> >> > >> >> page_size = read4(pevent); > >> >> > >> >> - read_header_files(pevent); > >> >> - read_ftrace_files(pevent); > >> >> - read_event_files(pevent); > >> >> - read_proc_kallsyms(pevent); > >> >> - read_ftrace_printk(pevent); > >> >> + if (read_header_files(pevent) || > >> >> + read_ftrace_files(pevent) || > >> >> + read_event_files(pevent) || > >> >> + read_proc_kallsyms(pevent) || > >> >> + read_ftrace_printk(pevent)) > >> >> + goto out; > >> > > >> > I think I like the err += func() and check for err < 0, better. > >> > >> Okay, I'll change them to err |= func() style if you're fine as Peter > >> suggested. > > > > += or |= I'm not picky ;-) > > Ah, one thing I also care was the short-circuit logic. I think we don't > need to call later functions if one fails, do we? Yeah, good point. It still looks ugly, but it does make sense. -- Steve -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/