From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v3 1/8] trace-cmd library: Use output handler when copying data from input file
Date: Fri, 8 Oct 2021 07:25:03 +0300 [thread overview]
Message-ID: <20211008042510.978362-2-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20211008042510.978362-1-tz.stoyanov@gmail.com>
When copying data between two trace files, use input and output
handlers, instead of raw file descriptors. Handlers take care of
file version and compression context.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
.../include/private/trace-cmd-private.h | 3 +-
lib/trace-cmd/include/trace-cmd-local.h | 2 +
lib/trace-cmd/trace-input.c | 145 +++++++++---------
lib/trace-cmd/trace-output.c | 6 +-
4 files changed, 82 insertions(+), 74 deletions(-)
diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h
index 8f5408ff..8ff46d52 100644
--- a/lib/trace-cmd/include/private/trace-cmd-private.h
+++ b/lib/trace-cmd/include/private/trace-cmd-private.h
@@ -185,7 +185,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/include/trace-cmd-local.h b/lib/trace-cmd/include/trace-cmd-local.h
index be08c3c0..b17cd305 100644
--- a/lib/trace-cmd/include/trace-cmd-local.h
+++ b/lib/trace-cmd/include/trace-cmd-local.h
@@ -59,6 +59,8 @@ out_write_section_header(struct tracecmd_output *handle, unsigned short header_i
char *description, enum tracecmd_section_flags flags, bool option);
int out_update_section_header(struct tracecmd_output *handle, unsigned long long offset);
+long long do_write_check(struct tracecmd_output *handle, const void *data, long long size);
+
struct cpu_data_source {
int fd;
int size;
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index a70bb0e6..afb45fb9 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -4381,44 +4381,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);
@@ -4430,65 +4433,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;
@@ -4496,103 +4500,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 (in_handle->file_state != TRACECMD_FILE_CMD_LINES - 1)
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)
*
@@ -4603,7 +4607,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)
{
@@ -4621,71 +4626,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 = section_open(handle, TRACECMD_OPTION_HEADER_INFO);
+ sec = section_open(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)
- section_close(handle, sec);
+ section_close(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 84fecabf..f47a0b8f 100644
--- a/lib/trace-cmd/trace-output.c
+++ b/lib/trace-cmd/trace-output.c
@@ -87,8 +87,8 @@ struct list_event_system {
#define HAS_SECTIONS(H) ((H)->file_version >= FILE_VERSION_SECTIONS)
-static stsize_t
-do_write_check(struct tracecmd_output *handle, const void *data, tsize_t size)
+__hidden long long
+do_write_check(struct tracecmd_output *handle, const void *data, long long size)
{
if (handle->do_compress)
return tracecmd_compress_write(handle->compress, data, size);
@@ -2492,7 +2492,7 @@ struct tracecmd_output *tracecmd_copy(struct tracecmd_input *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);
--
2.31.1
next prev parent reply other threads:[~2021-10-08 4:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-08 4:25 [PATCH v3 0/8] trace-cmd convert Tzvetomir Stoyanov (VMware)
2021-10-08 4:25 ` Tzvetomir Stoyanov (VMware) [this message]
2021-10-08 4:25 ` [PATCH v3 2/8] trace-cmd library: Handle version 7 files when copying headers between files Tzvetomir Stoyanov (VMware)
2021-10-08 4:25 ` [PATCH v3 3/8] trace-cmd library: Copy CPU count between trace files Tzvetomir Stoyanov (VMware)
2021-10-08 4:25 ` [PATCH v3 4/8] trace-cmd library: New API to copy buffer description " Tzvetomir Stoyanov (VMware)
2021-10-08 4:25 ` [PATCH v3 5/8] trace-cmd library: New API to copy options " Tzvetomir Stoyanov (VMware)
2021-10-08 4:25 ` [PATCH v3 6/8] trace-cmd library: New API to copy trace data " Tzvetomir Stoyanov (VMware)
2021-10-08 4:25 ` [PATCH v3 7/8] trace-cmd library: Extend tracecmd_copy() API Tzvetomir Stoyanov (VMware)
2021-10-08 4:25 ` [PATCH v3 8/8] trace-cmd: Add new subcommand "convert" Tzvetomir Stoyanov (VMware)
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=20211008042510.978362-2-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.