From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v3 25/25] trace-cmd: Read compressed trace data
Date: Wed, 12 May 2021 09:38:23 +0300 [thread overview]
Message-ID: <20210512063823.324610-26-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20210512063823.324610-1-tz.stoyanov@gmail.com>
When reading a trace.dat file of version 7, uncompress the trace data.
The trace data for each CPU is uncompressed in a temporary file, located
in /tmp directory with prefix "trace_cpu_data".
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
lib/trace-cmd/trace-input.c | 74 +++++++++++++++++++++++++++++--------
tracecmd/trace-read.c | 8 ++++
2 files changed, 67 insertions(+), 15 deletions(-)
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 1cec6917..e7fd0d30 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -54,6 +54,7 @@ struct page {
#endif
};
+#define COMPR_TEMP_FILE "/tmp/trace_cpu_dataXXXXXX"
struct cpu_data {
/* the first two never change */
unsigned long long file_offset;
@@ -72,6 +73,10 @@ struct cpu_data {
int page_cnt;
int cpu;
int pipe_fd;
+
+ /* temporary file for uncompressed cpu data */
+ int cfd;
+ char cfile[26]; /* strlen(COMPR_TEMP_FILE) */
};
struct input_buffer_instance {
@@ -1080,6 +1085,7 @@ static void *allocate_page_map(struct tracecmd_input *handle,
off64_t map_offset;
void *map;
int ret;
+ int fd;
if (handle->read_page) {
map = malloc(handle->page_size);
@@ -1119,12 +1125,15 @@ static void *allocate_page_map(struct tracecmd_input *handle,
map_size -= map_offset + map_size -
(cpu_data->file_offset + cpu_data->file_size);
+ if (cpu_data->cfd >= 0)
+ fd = cpu_data->cfd;
+ else
+ fd = handle->fd;
again:
page_map->size = map_size;
page_map->offset = map_offset;
- page_map->map = mmap(NULL, map_size, PROT_READ, MAP_PRIVATE,
- handle->fd, map_offset);
+ page_map->map = mmap(NULL, map_size, PROT_READ, MAP_PRIVATE, fd, map_offset);
if (page_map->map == MAP_FAILED) {
/* Try a smaller map */
@@ -2316,13 +2325,41 @@ tracecmd_read_prev(struct tracecmd_input *handle, struct tep_record *record)
/* Not reached */
}
+static int cpu_data_uncompress(struct tracecmd_input *handle, int cpu, unsigned long long *size)
+{
+ struct cpu_data *cpu_data;
+
+ cpu_data = &handle->cpu_data[cpu];
+ strcpy(cpu_data->cfile, COMPR_TEMP_FILE);
+ cpu_data->cfd = mkstemp(cpu_data->cfile);
+ if (cpu_data->cfd < 0)
+ return -1;
+ return tracecmd_uncompress_copy_to(handle->compress, cpu_data->cfd, NULL, size);
+}
+
static int init_cpu(struct tracecmd_input *handle, int cpu)
{
struct cpu_data *cpu_data = &handle->cpu_data[cpu];
+ unsigned long long size;
+ off64_t offset;
int i;
- cpu_data->offset = cpu_data->file_offset;
- cpu_data->size = cpu_data->file_size;
+ if (handle->file_version >= 7) {
+ offset = lseek64(handle->fd, 0, SEEK_CUR);
+ if (lseek64(handle->fd, cpu_data->file_offset, SEEK_SET) == (off_t)-1)
+ return -1;
+ if (cpu_data_uncompress(handle, cpu, &size) < 0)
+ return -1;
+ cpu_data->offset = 0;
+ cpu_data->file_offset = 0;
+ cpu_data->file_size = size;
+ cpu_data->size = size;
+ if (lseek64(handle->fd, offset, SEEK_SET) == (off_t)-1)
+ return -1;
+ } else {
+ cpu_data->offset = cpu_data->file_offset;
+ cpu_data->size = cpu_data->file_size;
+ }
cpu_data->timestamp = 0;
list_head_init(&cpu_data->page_maps);
@@ -3015,6 +3052,7 @@ static int read_cpu_data(struct tracecmd_input *handle)
handle->cpu_data[cpu].file_offset = offset;
handle->cpu_data[cpu].file_size = size;
+ handle->cpu_data[cpu].cfd = -1;
if (size > max_size)
max_size = size;
@@ -3637,17 +3675,23 @@ void tracecmd_close(struct tracecmd_input *handle)
/* The tracecmd_peek_data may have cached a record */
free_next(handle, cpu);
free_page(handle, cpu);
- if (handle->cpu_data && handle->cpu_data[cpu].kbuf) {
- kbuffer_free(handle->cpu_data[cpu].kbuf);
- if (handle->cpu_data[cpu].page_map)
- free_page_map(handle->cpu_data[cpu].page_map);
-
- if (handle->cpu_data[cpu].page_cnt)
- tracecmd_warning("%d pages still allocated on cpu %d%s",
- handle->cpu_data[cpu].page_cnt, cpu,
- show_records(handle->cpu_data[cpu].pages,
- handle->cpu_data[cpu].nr_pages));
- free(handle->cpu_data[cpu].pages);
+ if (handle->cpu_data) {
+ if (handle->cpu_data[cpu].kbuf) {
+ kbuffer_free(handle->cpu_data[cpu].kbuf);
+ if (handle->cpu_data[cpu].page_map)
+ free_page_map(handle->cpu_data[cpu].page_map);
+
+ if (handle->cpu_data[cpu].page_cnt)
+ tracecmd_warning("%d pages still allocated on cpu %d%s",
+ handle->cpu_data[cpu].page_cnt, cpu,
+ show_records(handle->cpu_data[cpu].pages,
+ handle->cpu_data[cpu].nr_pages));
+ free(handle->cpu_data[cpu].pages);
+ }
+ if (handle->cpu_data[cpu].cfd >= 0) {
+ close(handle->cpu_data[cpu].cfd);
+ unlink(handle->cpu_data[cpu].cfile);
+ }
}
}
diff --git a/tracecmd/trace-read.c b/tracecmd/trace-read.c
index b315283e..e7a4f196 100644
--- a/tracecmd/trace-read.c
+++ b/tracecmd/trace-read.c
@@ -1363,7 +1363,14 @@ struct tracecmd_input *read_trace_header(const char *file, int flags)
static void sig_end(int sig)
{
+ struct handle_list *handles;
+
fprintf(stderr, "trace-cmd: Received SIGINT\n");
+
+ list_for_each_entry(handles, &handle_list, list) {
+ tracecmd_close(handles->handle);
+ }
+
exit(0);
}
@@ -1922,6 +1929,7 @@ void trace_report (int argc, char **argv)
/* and version overrides uname! */
if (show_version)
otype = OUTPUT_VERSION_ONLY;
+
read_data_info(&handle_list, otype, global, align_ts);
list_for_each_entry(handles, &handle_list, list) {
--
2.31.1
prev parent reply other threads:[~2021-05-12 6:38 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 6:37 [PoC PATCH v3 00/25] Add trace file compression Tzvetomir Stoyanov (VMware)
2021-05-12 6:37 ` [PATCH v3 01/25] trace-cmd library: Remove unused private APIs for creating trace files Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 02/25] trace-cmd library: Remove unused API tracecmd_update_option Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 03/25] trace-cmd: Check if file version is supported Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 04/25] trace-cmd library: Add new API to get file version of input handler Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 05/25] trace-cmd library: Select the file version when writing trace file Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 06/25] trace-cmd: Add APIs for library initialization and free Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 07/25] trace-cmd library: Add support for compression algorithms Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 08/25] trace-cmd list: Show supported " Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 09/25] trace-cmd library: Bump the trace file version to 7 Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 10/25] trace-cmd library: Compress part of the trace file Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 11/25] trace-cmd library: Read compressed " Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 12/25] trace-cmd library: Add new API to get compression of input handler Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 13/25] trace-cmd library: Inherit compression algorithm from input file Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 14/25] trace-cmd library: Extend the create file APIs to support different compression Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 15/25] trace-cmd record: Add new parameter --compression Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 16/25] trace-cmd dump: Add support for trace files version 7 Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 17/25] trace-cmd library: Add support for zlib compression library Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 18/25] trace-cmd library: Hide the logic for updating buffer offset Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 19/25] trace-cmd: Move buffers description outside of options Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 20/25] trace-cmd library: Track the offset in the option section in the trace file Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 21/25] trace-cmd library: Add compression of the option section of " Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 22/25] trace-cmd library: Refactor the logic for writing trace data in the file Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 23/25] trace-cmd library: Add APIs for read and write compressed data in chunks Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` [PATCH v3 24/25] trace-cmd: Compress trace data Tzvetomir Stoyanov (VMware)
2021-05-12 6:38 ` Tzvetomir Stoyanov (VMware) [this message]
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=20210512063823.324610-26-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).