From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung.kim@lge.com>,
Namhyung Kim <namhyung@kernel.org>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Steven Rostedt <rostedt@goodmis.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 38/54] perf tools: Remove unused trace_read_data function
Date: Mon, 18 Mar 2013 13:25:23 -0300 [thread overview]
Message-ID: <1363623939-10748-39-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1363623939-10748-1-git-send-email-acme@infradead.org>
From: Namhyung Kim <namhyung.kim@lge.com>
And functions that called only from the trace_read_data().
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1363173585-9754-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/trace-event-read.c | 201 ------------------------------------
1 files changed, 0 insertions(+), 201 deletions(-)
diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index 3741572..7cb2463 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -41,8 +41,6 @@
static int input_fd;
-static int read_page;
-
int file_bigendian;
int host_bigendian;
static int long_size;
@@ -287,205 +285,6 @@ static void read_event_files(struct pevent *pevent)
}
}
-struct cpu_data {
- unsigned long long offset;
- unsigned long long size;
- unsigned long long timestamp;
- struct pevent_record *next;
- char *page;
- int cpu;
- int index;
- int page_size;
-};
-
-static struct cpu_data *cpu_data;
-
-static void update_cpu_data_index(int cpu)
-{
- cpu_data[cpu].offset += page_size;
- cpu_data[cpu].size -= page_size;
- cpu_data[cpu].index = 0;
-}
-
-static void get_next_page(int cpu)
-{
- off_t save_seek;
- off_t ret;
-
- if (!cpu_data[cpu].page)
- return;
-
- if (read_page) {
- if (cpu_data[cpu].size <= page_size) {
- free(cpu_data[cpu].page);
- cpu_data[cpu].page = NULL;
- return;
- }
-
- update_cpu_data_index(cpu);
-
- /* other parts of the code may expect the pointer to not move */
- save_seek = lseek(input_fd, 0, SEEK_CUR);
-
- ret = lseek(input_fd, cpu_data[cpu].offset, SEEK_SET);
- if (ret == (off_t)-1)
- die("failed to lseek");
- ret = read(input_fd, cpu_data[cpu].page, page_size);
- if (ret < 0)
- die("failed to read page");
-
- /* reset the file pointer back */
- lseek(input_fd, save_seek, SEEK_SET);
-
- return;
- }
-
- munmap(cpu_data[cpu].page, page_size);
- cpu_data[cpu].page = NULL;
-
- if (cpu_data[cpu].size <= page_size)
- return;
-
- update_cpu_data_index(cpu);
-
- cpu_data[cpu].page = mmap(NULL, page_size, PROT_READ, MAP_PRIVATE,
- input_fd, cpu_data[cpu].offset);
- if (cpu_data[cpu].page == MAP_FAILED)
- die("failed to mmap cpu %d at offset 0x%llx",
- cpu, cpu_data[cpu].offset);
-}
-
-static unsigned int type_len4host(unsigned int type_len_ts)
-{
- if (file_bigendian)
- return (type_len_ts >> 27) & ((1 << 5) - 1);
- else
- return type_len_ts & ((1 << 5) - 1);
-}
-
-static unsigned int ts4host(unsigned int type_len_ts)
-{
- if (file_bigendian)
- return type_len_ts & ((1 << 27) - 1);
- else
- return type_len_ts >> 5;
-}
-
-static int calc_index(void *ptr, int cpu)
-{
- return (unsigned long)ptr - (unsigned long)cpu_data[cpu].page;
-}
-
-struct pevent_record *trace_peek_data(struct pevent *pevent, int cpu)
-{
- struct pevent_record *data;
- void *page = cpu_data[cpu].page;
- int idx = cpu_data[cpu].index;
- void *ptr = page + idx;
- unsigned long long extend;
- unsigned int type_len_ts;
- unsigned int type_len;
- unsigned int delta;
- unsigned int length = 0;
-
- if (cpu_data[cpu].next)
- return cpu_data[cpu].next;
-
- if (!page)
- return NULL;
-
- if (!idx) {
- /* FIXME: handle header page */
- if (header_page_ts_size != 8)
- die("expected a long long type for timestamp");
- cpu_data[cpu].timestamp = data2host8(pevent, ptr);
- ptr += 8;
- switch (header_page_size_size) {
- case 4:
- cpu_data[cpu].page_size = data2host4(pevent, ptr);
- ptr += 4;
- break;
- case 8:
- cpu_data[cpu].page_size = data2host8(pevent, ptr);
- ptr += 8;
- break;
- default:
- die("bad long size");
- }
- ptr = cpu_data[cpu].page + header_page_data_offset;
- }
-
-read_again:
- idx = calc_index(ptr, cpu);
-
- if (idx >= cpu_data[cpu].page_size) {
- get_next_page(cpu);
- return trace_peek_data(pevent, cpu);
- }
-
- type_len_ts = data2host4(pevent, ptr);
- ptr += 4;
-
- type_len = type_len4host(type_len_ts);
- delta = ts4host(type_len_ts);
-
- switch (type_len) {
- case RINGBUF_TYPE_PADDING:
- if (!delta)
- die("error, hit unexpected end of page");
- length = data2host4(pevent, ptr);
- ptr += 4;
- length *= 4;
- ptr += length;
- goto read_again;
-
- case RINGBUF_TYPE_TIME_EXTEND:
- extend = data2host4(pevent, ptr);
- ptr += 4;
- extend <<= TS_SHIFT;
- extend += delta;
- cpu_data[cpu].timestamp += extend;
- goto read_again;
-
- case RINGBUF_TYPE_TIME_STAMP:
- ptr += 12;
- break;
- case 0:
- length = data2host4(pevent, ptr);
- ptr += 4;
- die("here! length=%d", length);
- break;
- default:
- length = type_len * 4;
- break;
- }
-
- cpu_data[cpu].timestamp += delta;
-
- data = malloc_or_die(sizeof(*data));
- memset(data, 0, sizeof(*data));
-
- data->ts = cpu_data[cpu].timestamp;
- data->size = length;
- data->data = ptr;
- ptr += length;
-
- cpu_data[cpu].index = calc_index(ptr, cpu);
- cpu_data[cpu].next = data;
-
- return data;
-}
-
-struct pevent_record *trace_read_data(struct pevent *pevent, int cpu)
-{
- struct pevent_record *data;
-
- data = trace_peek_data(pevent, cpu);
- cpu_data[cpu].next = NULL;
-
- return data;
-}
-
ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)
{
char buf[BUFSIZ];
--
1.7.1
next prev parent reply other threads:[~2013-03-18 16:26 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-18 16:24 [GIT PULL 00/54] perf/core improvements and fixes Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 01/54] perf tools: Fix build on non-glibc systems due to libio.h absence Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 02/54] perf tools: Remove a write-only variable in the debugfs code Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 03/54] perf tools: Honor parallel jobs Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 04/54] perf tools: Correct Makefile.include Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 05/54] perf tools: Sort command-list.txt alphabetically Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 06/54] perf tests: Make attr script verbose friendly Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 07/54] perf tests: Make attr script test event cpu Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 08/54] perf tests: Add attr record -C cpu test Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 09/54] perf tests: Add attr stat " Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 10/54] perf tools: Introduce tools/lib/lk library Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 11/54] perf tools: Extract perf-specific stuff from debugfs.c Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 12/54] tools/vm: Switch to liblk library Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 13/54] tools lib lk: Fix _FORTIFY_SOURCE builds Arnaldo Carvalho de Melo
2013-03-18 16:24 ` [PATCH 14/54] perf evlist: Remove cpus and threads arguments from perf_evlist__new() Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 15/54] perf evlist: Use cpu_map__nr() helper Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 16/54] perf evlist: Add thread_map__nr() helper Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 17/54] perf evlist: Pass struct perf_target to perf_evlist__prepare_workload() Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 18/54] perf evlist: Do not pass struct record_opts " Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 19/54] perf evlist: Add want_signal parameter " Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 20/54] perf stat: Use perf_evlist__prepare/start_workload() Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 21/54] perf annotate: Pass evsel instead of evidx on annotation functions Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 22/54] perf annotate: Add a comment on the symbol__parse_objdump_line() Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 23/54] perf annotate: Factor out disasm__calc_percent() Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 24/54] perf annotate: Cleanup disasm__calc_percent() Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 25/54] perf annotate: Add basic support to event group view Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 26/54] perf evsel: Introduce perf_evsel__is_group_event() helper Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 27/54] perf annotate: Factor out struct source_line_percent Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 28/54] perf annotate: Support event group view for --print-line Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 29/54] perf annotate browser: Make browser_disasm_line->percent an array Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 30/54] perf annotate browser: Use disasm__calc_percent() Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 31/54] perf annotate/gtk: Support event group view on GTK Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 32/54] perf annotate browser: Support event group view on TUI Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 33/54] perf trace: Get rid of a duplicate code Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 34/54] perf tools: Remove unused tracing functions Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 35/54] perf session: Remove unused perf_session__remove_thread method Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 36/54] perf machine: Move machine__remove_thread and make static Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 37/54] perf report: Remove duplicated include Arnaldo Carvalho de Melo
2013-03-18 16:25 ` Arnaldo Carvalho de Melo [this message]
2013-03-18 16:25 ` [PATCH 39/54] perf tools: Remove unused struct definitions Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 40/54] perf tools: Remove unnecessary calc_data_size variable Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 41/54] perf tools: Remove unused macro definitions Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 42/54] perf tools: Remove duplicated page_size definition Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 43/54] perf tests: Test breakpoint overflow signal handler Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 44/54] perf tests: Test breakpoint overflow signal handler counts Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 45/54] perf evsel: Cleanup perf_evsel__exit() Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 46/54] perf evlist: Introduce perf_evlist__close() Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 47/54] perf trace: Free evlist resources properly on return path Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 48/54] perf record: Fixup return path of cmd_record() Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 49/54] perf tests: Fixup return path of open-syscall-tp-fields test case Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 50/54] perf tests: Fixup return path of perf record " Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 51/54] perf test: Add test case for checking number of EXIT events Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 52/54] perf stat: Introduce --repeat forever Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 53/54] perf stat: Introduce evlist methods to allocate/free the stats Arnaldo Carvalho de Melo
2013-03-18 16:25 ` [PATCH 54/54] perf tests: Add a test case for checking sw clock event frequency Arnaldo Carvalho de Melo
2013-03-21 10:08 ` [GIT PULL 00/54] 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=1363623939-10748-39-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--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
all inboxes | Powered by JetHome®