@@ -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,42 @@ 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;
+ /* When creating a pipe, file_size is set to -1 to indicate no data in the file */
+ if (handle->file_version >= 7 && cpu_data->file_size != -1) {
+ 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 +3053,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;
@@ -3635,17 +3674,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);
+ }
}
}
@@ -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);
}
@@ -1924,6 +1931,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) {
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 | 75 +++++++++++++++++++++++++++++-------- tracecmd/trace-read.c | 8 ++++ 2 files changed, 68 insertions(+), 15 deletions(-)