From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759134Ab3K1PWP (ORCPT ); Thu, 28 Nov 2013 10:22:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15733 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754631Ab3K1PWO (ORCPT ); Thu, 28 Nov 2013 10:22:14 -0500 Date: Thu, 28 Nov 2013 16:21:37 +0100 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Frederic Weisbecker , Peter Zijlstra , Namhyung Kim , Mike Galbraith , David Ahern , Adrian Hunter Subject: [PATCHv3 6/7] perf record: Use perf_data_file__write for output file Message-ID: <20131128152137.GG1245@krava.brq.redhat.com> References: <1385634619-8129-1-git-send-email-jolsa@redhat.com> <1385634619-8129-7-git-send-email-jolsa@redhat.com> <20131128140344.GB3603@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20131128140344.GB3603@infradead.org> 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 Thu, Nov 28, 2013 at 12:03:44PM -0200, Arnaldo Carvalho de Melo wrote: > Em Thu, Nov 28, 2013 at 11:30:18AM +0100, Jiri Olsa escreveu: > > Changing the file output code to use the newly > > added perf_data_file__write interface. > > > > No functional change intended. > > But there is one, if we fail the pr_err() will not be called, will some > warning be emitter later on? ouch right, I missed that one... attached v3 ;-) > > If so, we should make it clear in the changelog. Lemme check by looking > at that code... I think it's better we dont change the functionality, just factor the code.. > > There are several places where the return of this function is propagated > and handled with relevant error messages, but at least one, the most > important, doesn't, i.e. this would be the only message the user would > receive, can you verify that? AFAICS they print out high(er) level errors, like for sythesizing events: pr_err("Couldn't record guest kernel [%d]'s reference" " relocation symbol.\n", machine->pid); I think we want that write failure message as well thanks, jirka --- Changing the file output code to use the newly added perf_data_file__write interface. No functional change intended. Signed-off-by: Jiri Olsa Cc: Ingo Molnar Cc: Frederic Weisbecker Cc: Peter Zijlstra Cc: Namhyung Kim Cc: Mike Galbraith Cc: David Ahern Cc: Adrian Hunter Cc: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index d93e2ee..2402eff 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -76,24 +76,19 @@ struct perf_record { long samples; }; -static int perf_record__write(struct perf_record *rec, void *buf, size_t size) +static ssize_t perf_record__write(struct perf_record *rec, + void *buf, size_t size) { - struct perf_data_file *file = &rec->file; - - while (size) { - ssize_t ret = write(file->fd, buf, size); - - if (ret < 0) { - pr_err("failed to write perf data, error: %m\n"); - return -1; - } - - size -= ret; - buf += ret; + struct perf_session *session = rec->session; + ssize_t ret; - rec->bytes_written += ret; + ret = perf_data_file__write(session->file, buf, size); + if (ret < 0) { + pr_err("failed to write perf data, error: %m\n"); + return -1; } + rec->bytes_written += ret; return 0; } -- 1.8.3.1