From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Andi Kleen <andi@firstfloor.org>, David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Stephane Eranian <eranian@google.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 11/18] perf tools: Introduce copyfile_offset() function
Date: Mon, 18 May 2015 12:50:34 -0300 [thread overview]
Message-ID: <1431964241-7609-12-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1431964241-7609-1-git-send-email-acme@kernel.org>
From: Namhyung Kim <namhyung@kernel.org>
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 <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
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 <acme@redhat.com>
---
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 6104afb7e1ef..0c264bc685ac 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 c4fe38ac8c00..8bce58b47a82 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);
--
2.1.0
next prev parent reply other threads:[~2015-05-18 15:55 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-18 15:50 [GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 01/18] perf tools: Use atomic.h for the map_groups refcount Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 02/18] perf machine: Stop accessing atomic_t::counter directly Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 03/18] perf evlist: Use atomic.h for the perf_mmap refcount Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 04/18] perf cgroup: Use atomic.h for refcounting Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 05/18] perf tools: Fix dwarf-aux.c compilation on i386 Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 06/18] perf tools: Fix "Command" sort_entry's cmp and collapse function Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 07/18] perf probe: Load map before glob matching Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 08/18] tools include: add __aligned_u64 to types.h Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 09/18] perf tools: Elliminate alignment holes Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 10/18] perf tools: Add rm_rf() utility function Arnaldo Carvalho de Melo
2015-05-18 15:50 ` Arnaldo Carvalho de Melo [this message]
2015-05-18 15:50 ` [PATCH 12/18] perf symbols: Protect dso symbol loading using a mutex Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 13/18] perf symbols: Protect dso cache tree using dso->lock Arnaldo Carvalho de Melo
2016-07-29 12:56 ` Bryton Lee
2016-07-29 15:09 ` Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 14/18] perf tools: Protect dso cache fd with a mutex Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 15/18] perf tools: Set vmlinux_path__nr_entries to 0 in vmlinux_path__exit Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 16/18] tools lib traceevent: Install libtraceevent.a into libdir Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 17/18] tools build: Change FEATURE_TESTS and FEATURE_DISPLAY to weak binding Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 18/18] perf bench numa: Share sched_getcpu() __weak def with cloexec.c Arnaldo Carvalho de Melo
2015-05-20 11:25 ` [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar
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=1431964241-7609-12-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=andi@firstfloor.org \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.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.