[v2,74/87] trace-cmd library: Use output handler when copying data from input file

Message ID	20210729050959.12263-75-tz.stoyanov@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-trace-devel-owner@kernel.org> From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v2 74/87] trace-cmd library: Use output handler when copying data from input file Date: Thu, 29 Jul 2021 08:09:46 +0300 Message-Id: <20210729050959.12263-75-tz.stoyanov@gmail.com> In-Reply-To: <20210729050959.12263-1-tz.stoyanov@gmail.com> References: <20210729050959.12263-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Trace file version 7 \| expand [v2,00/87] Trace file version 7 [v2,01/87] trace-cmd library: Read option id with correct endian [v2,02/87] trace-cmd report: Fix typos in error messages [v2,03/87] tarce-cmd library: Fix version string memory leak [v2,04/87] trace-cmd library: Fixed a memory leak on input handler close [v2,05/87] trace-cmd library: Fix possible memory corruption on processing a trace buffer [v2,06/87] trace-cmd library: Add constructor and destructor [v2,07/87] trace-cmd library: Add cache functionality to network message handler [v2,08/87] trace-cmd library: Add support for compression algorithms [v2,09/87] trace-cmd list: Show supported compression algorithms [v2,10/87] trace-cmd library: Internal helpers for compressing data [v2,11/87] trace-cmd library: Internal helpers for uncompressing data [v2,12/87] trace-cmd library: Define trace file version 7 [v2,13/87] trace-cmd library: Refactor APIs for creating output handler [v2,14/87] trace-cmd library: Reuse within the library the function that checks file state. [v2,15/87] trace-cmd library: New API to get the version of output handler [v2,16/87] trace-cmd library: Inherit compression algorithm from input file [v2,17/87] trace-cmd library: New API to configure compression on an output handler [v2,18/87] trace-cmd record: Add compression to the trace context [v2,19/87] trace-cmd library: Write compression header in the trace file [v2,20/87] trace-cmd library: Compress part of the trace file [v2,21/87] trace-cmd library: Add internal helper functon for writing headers before file sections [v2,22/87] trace-cmd library: Write header before file sections [v2,23/87] trace-cmd library: Refactor the logic for writing trace data in the file [v2,24/87] trace-cmd library: Add local helper function for data compression [v2,25/87] trace-cmd library: Compress the trace data [v2,26/87] tarce-cmd library: Add multiple options sections in trace file version 7 [v2,27/87] trace-cmd library: Do not write CPU count section in trace files version 7 [v2,28/87] trace-cmd library: Move CPU flyrecord trace metadata into the buffer option, for trace f… [v2,29/87] trace-cmd record: Append trace options after the trace data are written [v2,30/87] trace-cmd library: Add section header before flyrecord trace data [v2,31/87] trace-cmd library: Fit CPU latency trace data in the new trace file version 7 format [v2,32/87] trace-cmd library: Do not write CPUs with empty trace data [v2,33/87] trace-cmd library: Add macro to check file state on reading [v2,34/87] trace-cmd library: Introduce sections in trace file reading logic [v2,35/87] trace-cmd library: Initialize internal sections database on file read [v2,36/87] trace-cmd library: Use sections database when reading parts of the trace file [v2,37/87] trace-cmd library: Set log size to the input tep handler when it is read from the file [v2,38/87] trace-cmd library: Fix possible memory leak in read_ftrace_files() [v2,39/87] trace-cmd library: Fix possible memory leak in read_event_files() [v2,40/87] trace-cmd library: Fix possible memory leak in read_proc_kallsyms() [v2,41/87] trace-cmd library: Fix possible memory leak in read_ftrace_printk() [v2,42/87] trace-cmd library: Fix possible memory leak in read_and_parse_cmdlines() [v2,43/87] trace-cmd library: Track maximum CPUs count in input handler [v2,44/87] trace-cmd library: Set input handler default values in allocation function [v2,45/87] trace-cmd library: Read headers from trace file version 7 [v2,46/87] tarce-cmd library: Do not use local variables when reading CPU stat option [v2,47/87] trace-cmd library: Read handle header and compression of the option section [v2,48/87] trace-cmd library: Read extended BUFFER option [v2,49/87] trace-cmd library: Handle the extended DONE option [v2,50/87] trace-cmd library: Read compression header [v2,51/87] trace-cmd library: Extend the input handler with trace data decompression context [v2,52/87] trace-cmd library: Initialize CPU data decompression logic [v2,53/87] trace-cmd library: Initialize CPU data for reading from version 7 trace files [v2,54/87] trace-cmd library: Add logic for in-memory decompression [v2,55/87] trace-cmd library: Handle latency trace in version 7 files [v2,56/87] trace-cmd library: Handle buffer trace data init for version 7 files [v2,57/87] trace-cmd report: Use the new latency API to read data [v2,58/87] trace-cmd report: Close input file handlers on exit [v2,59/87] trace-cmd report: Do not print empty buffer name [v2,60/87] trace-cmd report: Init the top trace instance earlier [v2,61/87] trace-cmd: Call additional APIs when creating trace file [v2,62/87] trace-cmd dump: Add helpers for processing trace file version 7 [v2,63/87] trace-cmd dump: Print compression header [v2,64/87] trace-cmd dump: Add helpers for processing trace file sections [v2,65/87] trace-cmd dump: Read recursively all options sections [v2,66/87] trace-cmd dump: Read extended BUFFER option [v2,67/87] trace-cmd dump: Dump sections [v2,68/87] trace-cmd dump: Dump trace file version 7 [v2,69/87] trace-cmd dump: Dump sections content [v2,70/87] trace-cmd dump: Add new argument --sections [v2,71/87] trace-cmd dump: Align better the output of flyrecord dump [v2,72/87] trace-cmd library: Add zlib compression algorithm [v2,73/87] trace-cmd library: Reuse local function that writes to output handler [v2,74/87] trace-cmd library: Use output handler when copying data from input file [v2,75/87] trace-cmd library: Handle version 7 files when copying headers between files [v2,76/87] tarce-cmd library: Copy CPU count between trace files [v2,77/87] tarce-cmd library: New API to copy buffer description between trace files [v2,78/87] tarce-cmd library: New API to copy options between trace files [v2,79/87] tarce-cmd library: New API to copy trace data between trace files [v2,80/87] trace-cmd library: Extend tracecmd_copy() API [v2,81/87] trace-cmd library: Set correct CPU to the record, retrieved with tracecmd_peek_data [v2,82/87] trace-cmd: Add new subcommand "convert" [v2,83/87] trace-cmd report: Add new parameters for version 7 trace files [v2,84/87] trace-cmd: Update bash completion [v2,85/87] tarce-cmd: Man page for "trace-cmd convert" [v2,86/87] tarce-cmd: Update record man page [v2,87/87] trace-cmd: Document trace file version 7

diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h index 0a3e12cf..05a2ea01 100644 --- a/lib/trace-cmd/include/private/trace-cmd-private.h +++ b/lib/trace-cmd/include/private/trace-cmd-private.h @@ -179,7 +179,8 @@ int tracecmd_get_parsing_failures(struct tracecmd_input *handle); int tracecmd_long_size(struct tracecmd_input *handle); int tracecmd_page_size(struct tracecmd_input *handle); int tracecmd_cpus(struct tracecmd_input *handle); -int tracecmd_copy_headers(struct tracecmd_input *handle, int fd, +int tracecmd_copy_headers(struct tracecmd_input *in_handle, + struct tracecmd_output *out_handle, enum tracecmd_file_states start_state, enum tracecmd_file_states end_state); void tracecmd_set_flag(struct tracecmd_input *handle, int flag); diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c index 2b98e6d8..2d2750ad 100644 --- a/lib/trace-cmd/trace-input.c +++ b/lib/trace-cmd/trace-input.c @@ -4357,44 +4357,47 @@ void tracecmd_close(struct tracecmd_input *handle) free(handle); } -static int read_copy_size8(struct tracecmd_input *handle, int fd, unsigned long long *size) +static int read_copy_size8(struct tracecmd_input *in_handle, + struct tracecmd_output *out_handle, unsigned long long *size) { /* read size */ - if (do_read_check(handle, size, 8)) + if (do_read_check(in_handle, size, 8)) return -1; - if (__do_write_check(fd, size, 8)) + if (do_write_check(out_handle, size, 8)) return -1; - *size = tep_read_number(handle->pevent, size, 8); + *size = tep_read_number(in_handle->pevent, size, 8); return 0; } -static int read_copy_size4(struct tracecmd_input *handle, int fd, unsigned int *size) +static int read_copy_size4(struct tracecmd_input *in_handle, struct tracecmd_output *out_handle, + unsigned int *size) { /* read size */ - if (do_read_check(handle, size, 4)) + if (do_read_check(in_handle, size, 4)) return -1; - if (__do_write_check(fd, size, 4)) + if (do_write_check(out_handle, size, 4)) return -1; - *size = tep_read_number(handle->pevent, size, 4); + *size = tep_read_number(in_handle->pevent, size, 4); return 0; } -static int read_copy_data(struct tracecmd_input *handle, - unsigned long long size, int fd) +static int read_copy_data(struct tracecmd_input *in_handle, + unsigned long long size, + struct tracecmd_output *out_handle) { char *buf; buf = malloc(size); if (!buf) return -1; - if (do_read_check(handle, buf, size)) + if (do_read_check(in_handle, buf, size)) goto failed_read; - if (__do_write_check(fd, buf, size)) + if (do_write_check(out_handle, buf, size)) goto failed_read; free(buf); @@ -4406,65 +4409,66 @@ static int read_copy_data(struct tracecmd_input *handle, return -1; } -static int copy_header_files(struct tracecmd_input *handle, int fd) +static int copy_header_files(struct tracecmd_input *in_handle, + struct tracecmd_output *out_handle) { unsigned long long size; - if (handle->file_state != TRACECMD_FILE_HEADERS - 1) + if (in_handle->file_state != TRACECMD_FILE_HEADERS - 1) return -1; /* "header_page" */ - if (read_copy_data(handle, 12, fd) < 0) + if (read_copy_data(in_handle, 12, out_handle) < 0) return -1; - if (read_copy_size8(handle, fd, &size) < 0) + if (read_copy_size8(in_handle, out_handle, &size) < 0) return -1; - if (read_copy_data(handle, size, fd) < 0) + if (read_copy_data(in_handle, size, out_handle) < 0) return -1; /* "header_event" */ - if (read_copy_data(handle, 13, fd) < 0) + if (read_copy_data(in_handle, 13, out_handle) < 0) return -1; - if (read_copy_size8(handle, fd, &size) < 0) + if (read_copy_size8(in_handle, out_handle, &size) < 0) return -1; - if (read_copy_data(handle, size, fd) < 0) + if (read_copy_data(in_handle, size, out_handle) < 0) return -1; - handle->file_state = TRACECMD_FILE_HEADERS; + in_handle->file_state = TRACECMD_FILE_HEADERS; return 0; } -static int copy_ftrace_files(struct tracecmd_input *handle, int fd) +static int copy_ftrace_files(struct tracecmd_input *in_handle, struct tracecmd_output *out_handle) { unsigned long long size; unsigned int count; unsigned int i; - if (handle->file_state != TRACECMD_FILE_FTRACE_EVENTS - 1) + if (in_handle->file_state != TRACECMD_FILE_FTRACE_EVENTS - 1) return -1; - if (read_copy_size4(handle, fd, &count) < 0) + if (read_copy_size4(in_handle, out_handle, &count) < 0) return -1; for (i = 0; i < count; i++) { - if (read_copy_size8(handle, fd, &size) < 0) + if (read_copy_size8(in_handle, out_handle, &size) < 0) return -1; - if (read_copy_data(handle, size, fd) < 0) + if (read_copy_data(in_handle, size, out_handle) < 0) return -1; } - handle->file_state = TRACECMD_FILE_FTRACE_EVENTS; + in_handle->file_state = TRACECMD_FILE_FTRACE_EVENTS; return 0; } -static int copy_event_files(struct tracecmd_input *handle, int fd) +static int copy_event_files(struct tracecmd_input *in_handle, struct tracecmd_output *out_handle) { unsigned long long size; char *system; @@ -4472,103 +4476,103 @@ static int copy_event_files(struct tracecmd_input *handle, int fd) unsigned int count; unsigned int i,x; - if (handle->file_state != TRACECMD_FILE_ALL_EVENTS - 1) + if (in_handle->file_state != TRACECMD_FILE_ALL_EVENTS - 1) return -1; - if (read_copy_size4(handle, fd, &systems) < 0) + if (read_copy_size4(in_handle, out_handle, &systems) < 0) return -1; for (i = 0; i < systems; i++) { - system = read_string(handle); + system = read_string(in_handle); if (!system) return -1; - if (__do_write_check(fd, system, strlen(system) + 1)) { + if (do_write_check(out_handle, system, strlen(system) + 1)) { free(system); return -1; } free(system); - if (read_copy_size4(handle, fd, &count) < 0) + if (read_copy_size4(in_handle, out_handle, &count) < 0) return -1; for (x=0; x < count; x++) { - if (read_copy_size8(handle, fd, &size) < 0) + if (read_copy_size8(in_handle, out_handle, &size) < 0) return -1; - if (read_copy_data(handle, size, fd) < 0) + if (read_copy_data(in_handle, size, out_handle) < 0) return -1; } } - handle->file_state = TRACECMD_FILE_ALL_EVENTS; + in_handle->file_state = TRACECMD_FILE_ALL_EVENTS; return 0; } -static int copy_proc_kallsyms(struct tracecmd_input *handle, int fd) +static int copy_proc_kallsyms(struct tracecmd_input *in_handle, struct tracecmd_output *out_handle) { unsigned int size; - if (handle->file_state != TRACECMD_FILE_KALLSYMS - 1) + if (in_handle->file_state != TRACECMD_FILE_KALLSYMS - 1) return -1; - if (read_copy_size4(handle, fd, &size) < 0) + if (read_copy_size4(in_handle, out_handle, &size) < 0) return -1; if (!size) return 0; /* OK? */ - if (read_copy_data(handle, size, fd) < 0) + if (read_copy_data(in_handle, size, out_handle) < 0) return -1; - handle->file_state = TRACECMD_FILE_KALLSYMS; + in_handle->file_state = TRACECMD_FILE_KALLSYMS; return 0; } -static int copy_ftrace_printk(struct tracecmd_input *handle, int fd) +static int copy_ftrace_printk(struct tracecmd_input *in_handle, struct tracecmd_output *out_handle) { unsigned int size; - if (handle->file_state != TRACECMD_FILE_PRINTK - 1) + if (in_handle->file_state != TRACECMD_FILE_PRINTK - 1) return -1; - if (read_copy_size4(handle, fd, &size) < 0) + if (read_copy_size4(in_handle, out_handle, &size) < 0) return -1; if (!size) return 0; /* OK? */ - if (read_copy_data(handle, size, fd) < 0) + if (read_copy_data(in_handle, size, out_handle) < 0) return -1; - handle->file_state = TRACECMD_FILE_PRINTK; + in_handle->file_state = TRACECMD_FILE_PRINTK; return 0; } -static int copy_command_lines(struct tracecmd_input *handle, int fd) +static int copy_command_lines(struct tracecmd_input *in_handle, struct tracecmd_output *out_handle) { unsigned long long size; - if (handle->file_state != TRACECMD_FILE_CMD_LINES - 1) + if (!check_out_state(out_handle, TRACECMD_FILE_CMD_LINES)) return -1; - if (read_copy_size8(handle, fd, &size) < 0) + if (read_copy_size8(in_handle, out_handle, &size) < 0) return -1; if (!size) return 0; /* OK? */ - if (read_copy_data(handle, size, fd) < 0) + if (read_copy_data(in_handle, size, out_handle) < 0) return -1; - handle->file_state = TRACECMD_FILE_CMD_LINES; + in_handle->file_state = TRACECMD_FILE_CMD_LINES; return 0; } /** * tracecmd_copy_headers - Copy headers from a tracecmd_input handle to a file descriptor - * @handle: input handle for the trace.dat file to copy from. - * @fd: The file descriptor to copy to. + * @in_handle: input handle for the trace.dat file to copy from. + * @out_handle: output handle to the trace.dat file to copy to. * @start_state: The file state to start copying from (zero for the beginnig) * @end_state: The file state to stop at (zero for up to cmdlines) * @@ -4579,7 +4583,8 @@ static int copy_command_lines(struct tracecmd_input *handle, int fd) * NOTE: The input handle is also modified, and ends at the end * state as well. */ -int tracecmd_copy_headers(struct tracecmd_input *handle, int fd, +int tracecmd_copy_headers(struct tracecmd_input *in_handle, + struct tracecmd_output *out_handle, enum tracecmd_file_states start_state, enum tracecmd_file_states end_state) { @@ -4597,71 +4602,71 @@ int tracecmd_copy_headers(struct tracecmd_input *handle, int fd, if (end_state < TRACECMD_FILE_HEADERS) return 0; - if (handle->file_state >= start_state) { + if (in_handle->file_state >= start_state) { /* Set the handle to just before the start state */ - sec = open_section(handle, TRACECMD_OPTION_HEADER_INFO); + sec = open_section(in_handle, TRACECMD_OPTION_HEADER_INFO); if (!sec) return -1; /* Now that the file handle has moved, change its state */ - handle->file_state = TRACECMD_FILE_INIT; + in_handle->file_state = TRACECMD_FILE_INIT; } /* Try to bring the input up to the start state - 1 */ - ret = tracecmd_read_headers(handle, start_state - 1); + ret = tracecmd_read_headers(in_handle, start_state - 1); if (sec) - close_section(handle, sec); + close_section(in_handle, sec); if (ret < 0) goto out; switch (start_state) { case TRACECMD_FILE_HEADERS: - ret = copy_header_files(handle, fd); + ret = copy_header_files(in_handle, out_handle); if (ret < 0) goto out; /* fallthrough */ case TRACECMD_FILE_FTRACE_EVENTS: /* handle's state is now updating with the copies */ - if (end_state <= handle->file_state) + if (end_state <= in_handle->file_state) return 0; - ret = copy_ftrace_files(handle, fd); + ret = copy_ftrace_files(in_handle, out_handle); if (ret < 0) goto out; /* fallthrough */ case TRACECMD_FILE_ALL_EVENTS: - if (end_state <= handle->file_state) + if (end_state <= in_handle->file_state) return 0; - ret = copy_event_files(handle, fd); + ret = copy_event_files(in_handle, out_handle); if (ret < 0) goto out; /* fallthrough */ case TRACECMD_FILE_KALLSYMS: - if (end_state <= handle->file_state) + if (end_state <= in_handle->file_state) return 0; - ret = copy_proc_kallsyms(handle, fd); + ret = copy_proc_kallsyms(in_handle, out_handle); if (ret < 0) goto out; /* fallthrough */ case TRACECMD_FILE_PRINTK: - if (end_state <= handle->file_state) + if (end_state <= in_handle->file_state) return 0; - ret = copy_ftrace_printk(handle, fd); + ret = copy_ftrace_printk(in_handle, out_handle); if (ret < 0) goto out; /* fallthrough */ case TRACECMD_FILE_CMD_LINES: - if (end_state <= handle->file_state) + if (end_state <= in_handle->file_state) return 0; - ret = copy_command_lines(handle, fd); + ret = copy_command_lines(in_handle, out_handle); default: break; } diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c index 01c1a4f5..8499ab6f 100644 --- a/lib/trace-cmd/trace-output.c +++ b/lib/trace-cmd/trace-output.c @@ -2494,7 +2494,7 @@ struct tracecmd_output *tracecmd_copy(struct tracecmd_input *ihandle, if (tracecmd_output_set_from_input(handle, ihandle)) goto out_free; tracecmd_output_write_init(handle); - if (tracecmd_copy_headers(ihandle, handle->fd, 0, 0) < 0) + if (tracecmd_copy_headers(ihandle, handle, 0, 0) < 0) goto out_free; handle->file_state = tracecmd_get_file_state(ihandle);

[v2,74/87] trace-cmd library: Use output handler when copying data from input file

Commit Message

Patch