From: Jiri Olsa <jolsa@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Jiri Olsa <jolsa@redhat.com>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@elte.hu>, Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Steven Rostedt <rostedt@goodmis.org>,
David Ahern <dsahern@gmail.com>
Subject: [PATCH 19/22] perf tools: Add filename__read_str util function
Date: Thu, 21 Nov 2013 12:01:17 +0100 [thread overview]
Message-ID: <1385031680-9014-20-git-send-email-jolsa@redhat.com> (raw)
In-Reply-To: <1385031680-9014-1-git-send-email-jolsa@redhat.com>
Adding filename__read_str util function to read
text file and return it in the char array.
The interface is:
int filename__read_str(const char *filename, char **buf, size_t *sizep)
Returns 0/-1 if the read suceeded/fail respectively.
buf - place to store the data pointer
size - place to store data size
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: David Ahern <dsahern@gmail.com>
---
tools/perf/util/util.c | 41 +++++++++++++++++++++++++++++++++++++++++
tools/perf/util/util.h | 1 +
2 files changed, 42 insertions(+)
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 28a0a89..e96cc90 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -413,3 +413,44 @@ int filename__read_int(const char *filename, int *value)
close(fd);
return err;
}
+
+int filename__read_str(const char *filename, char **buf, size_t *sizep)
+{
+ size_t size = 0, alloc_size = 0;
+ void *bf = NULL, *nbf;
+ int fd, n, err = 0;
+
+ fd = open(filename, O_RDONLY);
+ if (fd < 0)
+ return -errno;
+
+ do {
+ if (size == alloc_size) {
+ alloc_size += BUFSIZ;
+ nbf = realloc(bf, alloc_size);
+ if (!nbf) {
+ err = -ENOMEM;
+ break;
+ }
+
+ bf = nbf;
+ }
+
+ n = read(fd, bf + size, BUFSIZ);
+ if (n < 0) {
+ err = 0;
+ break;
+ }
+
+ size += n;
+ } while (n > 0);
+
+ if (!err) {
+ *sizep = size;
+ *buf = bf;
+ } else
+ free(bf);
+
+ close(fd);
+ return err;
+}
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index c8f362d..e54bb10 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -307,4 +307,5 @@ char *get_srcline(struct dso *dso, unsigned long addr);
void free_srcline(char *srcline);
int filename__read_int(const char *filename, int *value);
+int filename__read_str(const char *filename, char **buf, size_t *sizep);
#endif /* GIT_COMPAT_UTIL_H */
--
1.8.3.1
next prev parent reply other threads:[~2013-11-21 11:02 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-21 11:00 [PATCH 00/22] perf tools: Add traceevent plugins support Jiri Olsa
2013-11-21 11:00 ` [PATCH 01/22] tools lib traceevent: Add plugin support Jiri Olsa
2013-11-21 11:58 ` Steven Rostedt
2013-11-22 14:17 ` Namhyung Kim
2013-11-23 8:12 ` Steven Rostedt
2013-11-25 7:33 ` Namhyung Kim
2013-11-25 9:30 ` Jiri Olsa
2013-11-21 11:01 ` [PATCH 02/22] tools lib traceevent: Add plugin build support Jiri Olsa
2013-11-21 11:01 ` [PATCH 03/22] tools lib traceevent: Add traceevent_host_bigendian function Jiri Olsa
2013-11-22 14:22 ` Namhyung Kim
2013-11-23 8:27 ` Steven Rostedt
2013-11-25 7:24 ` Namhyung Kim
2013-11-25 9:33 ` Jiri Olsa
2013-11-21 11:01 ` [PATCH 04/22] tools lib traceevent: Add jbd2 plugin Jiri Olsa
2013-11-21 13:09 ` Steven Rostedt
2013-11-22 14:27 ` Namhyung Kim
2013-11-23 8:52 ` Steven Rostedt
2013-11-25 7:38 ` Namhyung Kim
2013-11-25 9:46 ` Jiri Olsa
2013-11-25 10:03 ` Jiri Olsa
2013-11-21 11:01 ` [PATCH 05/22] tools lib traceevent: Add hrtimer plugin Jiri Olsa
2013-11-21 13:10 ` Steven Rostedt
2013-11-22 14:33 ` Namhyung Kim
2013-11-23 8:59 ` Steven Rostedt
2013-11-21 11:01 ` [PATCH 06/22] tools lib traceevent: Add kmem plugin Jiri Olsa
2013-11-21 13:14 ` Steven Rostedt
2013-11-22 14:38 ` Namhyung Kim
2013-11-23 9:06 ` Steven Rostedt
2013-11-25 7:43 ` Namhyung Kim
2013-11-21 11:01 ` [PATCH 07/22] tools lib traceevent: Add kvm plugin Jiri Olsa
2013-11-21 13:15 ` Steven Rostedt
2013-11-22 14:45 ` Namhyung Kim
2013-11-23 9:15 ` Steven Rostedt
2013-11-21 11:01 ` [PATCH 08/22] tools lib traceevent: Add mac80211 plugin Jiri Olsa
2013-11-21 11:01 ` [PATCH 09/22] tools lib traceevent: Add sched_switch plugin Jiri Olsa
2013-11-21 13:18 ` Steven Rostedt
[not found] ` <1385132034.1747.58.camel@leonhard>
2013-11-23 9:16 ` Steven Rostedt
2013-11-21 11:01 ` [PATCH 10/22] tools lib traceevent: Add function plugin Jiri Olsa
2013-11-21 13:20 ` Steven Rostedt
2013-11-22 15:03 ` Namhyung Kim
2013-11-23 9:22 ` Steven Rostedt
2013-11-21 11:01 ` [PATCH 11/22] tools lib traceevent: Add xen plugin Jiri Olsa
2013-11-22 15:06 ` Namhyung Kim
2013-11-25 13:38 ` Jiri Olsa
2013-11-21 11:01 ` [PATCH 12/22] tools lib traceevent: Add scsi plugin Jiri Olsa
2013-11-22 15:24 ` Namhyung Kim
2013-11-23 9:25 ` Steven Rostedt
2013-11-21 11:01 ` [PATCH 13/22] tools lib traceevent: Add cfg80211 plugin Jiri Olsa
2013-11-22 15:16 ` Namhyung Kim
2013-11-23 9:27 ` Steven Rostedt
2013-11-21 11:01 ` [PATCH 14/22] tools lib traceevent: Update kvm plugin with is_writable_pte helper Jiri Olsa
2013-11-22 15:19 ` Namhyung Kim
2013-11-23 9:28 ` Steven Rostedt
2013-11-21 11:01 ` [PATCH 15/22] tools lib traceevent: Change pevent_parse_event to return event format Jiri Olsa
2013-11-21 13:28 ` Steven Rostedt
2013-11-21 13:42 ` Jiri Olsa
2013-11-21 11:01 ` [PATCH 16/22] tools lib traceevent: Harmonize the install messages in lib-traceevent Jiri Olsa
2013-11-21 11:01 ` [PATCH 17/22] perf tools: Add build and install plugins targets Jiri Olsa
2013-11-22 15:27 ` Namhyung Kim
2013-11-25 14:51 ` Jiri Olsa
2013-11-27 8:13 ` Namhyung Kim
2013-11-21 11:01 ` [PATCH 18/22] perf tools: Add udis86 disassembler feature check Jiri Olsa
2013-11-22 15:38 ` Namhyung Kim
2013-11-25 15:02 ` Jiri Olsa
2013-11-21 11:01 ` Jiri Olsa [this message]
2013-11-22 15:43 ` [PATCH 19/22] perf tools: Add filename__read_str util function Namhyung Kim
2013-11-25 15:17 ` Jiri Olsa
2013-11-21 11:01 ` [PATCH 20/22] perf tools: Add trace-event object Jiri Olsa
2013-11-21 11:01 ` [PATCH 21/22] perf tools: Add trace-event global object for tracepoint interface Jiri Olsa
2013-11-22 15:47 ` Namhyung Kim
2013-11-25 16:03 ` Jiri Olsa
2013-11-27 13:46 ` Namhyung Kim
2013-11-27 15:10 ` Jiri Olsa
2013-11-27 15:27 ` Jiri Olsa
2013-11-27 15:49 ` Namhyung Kim
2013-11-21 11:01 ` [PATCH 22/22] perf tools: Overload pr_stat traceevent print function Jiri Olsa
2013-11-22 15:50 ` 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=1385031680-9014-20-git-send-email-jolsa@redhat.com \
--to=jolsa@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=rostedt@goodmis.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome