From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753817AbbETM0Z (ORCPT ); Wed, 20 May 2015 08:26:25 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56811 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753639AbbETMZN (ORCPT ); Wed, 20 May 2015 08:25:13 -0400 Date: Wed, 20 May 2015 05:24:42 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: adrian.hunter@intel.com, dsahern@gmail.com, andi@firstfloor.org, namhyung@kernel.org, tglx@linutronix.de, a.p.zijlstra@chello.nl, hpa@zytor.com, mingo@kernel.org, eranian@google.com, acme@redhat.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, fweisbec@gmail.com Reply-To: adrian.hunter@intel.com, dsahern@gmail.com, andi@firstfloor.org, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, a.p.zijlstra@chello.nl, namhyung@kernel.org, linux-kernel@vger.kernel.org, fweisbec@gmail.com, jolsa@kernel.org, eranian@google.com, acme@redhat.com In-Reply-To: <1431909055-21442-4-git-send-email-namhyung@kernel.org> References: <20150304145824.GD7519@krava.brq.redhat.com> <1431909055-21442-4-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Introduce copyfile_offset() function Git-Commit-ID: 9c9f5a2f1944e8b6bf2b618d04b31e1c1760637e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9c9f5a2f1944e8b6bf2b618d04b31e1c1760637e Gitweb: http://git.kernel.org/tip/9c9f5a2f1944e8b6bf2b618d04b31e1c1760637e Author: Namhyung Kim AuthorDate: Mon, 18 May 2015 09:30:18 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 18 May 2015 10:17:35 -0300 perf tools: Introduce copyfile_offset() function The copyfile_offset() function is to copy source data from given offset to a destination file with an offset. It'll be used to build an indexed data file. Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Andi Kleen Cc: David Ahern Cc: Frederic Weisbecker Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/20150304145824.GD7519@krava.brq.redhat.com Link: http://lkml.kernel.org/r/1431909055-21442-4-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/util.c | 38 +++++++++++++++++++++++++++++--------- tools/perf/util/util.h | 1 + 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index 6104afb..0c264bc 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -145,11 +145,38 @@ out: return err; } +int copyfile_offset(int ifd, loff_t off_in, int ofd, loff_t off_out, u64 size) +{ + void *ptr; + loff_t pgoff; + + pgoff = off_in & ~(page_size - 1); + off_in -= pgoff; + + ptr = mmap(NULL, off_in + size, PROT_READ, MAP_PRIVATE, ifd, pgoff); + if (ptr == MAP_FAILED) + return -1; + + while (size) { + ssize_t ret = pwrite(ofd, ptr + off_in, size, off_out); + if (ret < 0 && errno == EINTR) + continue; + if (ret <= 0) + break; + + size -= ret; + off_in += ret; + off_out -= ret; + } + munmap(ptr, off_in + size); + + return size ? -1 : 0; +} + int copyfile_mode(const char *from, const char *to, mode_t mode) { int fromfd, tofd; struct stat st; - void *addr; int err = -1; if (stat(from, &st)) @@ -166,15 +193,8 @@ int copyfile_mode(const char *from, const char *to, mode_t mode) if (tofd < 0) goto out_close_from; - addr = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fromfd, 0); - if (addr == MAP_FAILED) - goto out_close_to; - - if (write(tofd, addr, st.st_size) == st.st_size) - err = 0; + err = copyfile_offset(fromfd, 0, tofd, 0, st.st_size); - munmap(addr, st.st_size); -out_close_to: close(tofd); if (err) unlink(to); diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index c4fe38a..8bce58b 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -252,6 +252,7 @@ int mkdir_p(char *path, mode_t mode); int rm_rf(char *path); int copyfile(const char *from, const char *to); int copyfile_mode(const char *from, const char *to, mode_t mode); +int copyfile_offset(int fromfd, loff_t from_ofs, int tofd, loff_t to_ofs, u64 size); s64 perf_atoll(const char *str); char **argv_split(const char *str, int *argcp);