@@ -197,6 +197,8 @@ int tracecmd_copy_headers(struct tracecmd_input *in_handle,
enum tracecmd_file_states end_state);
int tracecmd_copy_buffer_descr(struct tracecmd_input *in_handle,
struct tracecmd_output *out_handle);
+int tracecmd_copy_options(struct tracecmd_input *in_handle,
+ struct tracecmd_output *out_handle);
void tracecmd_set_flag(struct tracecmd_input *handle, int flag);
void tracecmd_clear_flag(struct tracecmd_input *handle, int flag);
unsigned long tracecmd_get_flags(struct tracecmd_input *handle);
@@ -342,6 +344,7 @@ int tracecmd_append_buffer_cpu_data(struct tracecmd_output *handle,
const char *name, int cpus, char * const *cpu_data_files);
struct tracecmd_output *tracecmd_get_output_handle_fd(int fd);
unsigned long tracecmd_get_out_file_version(struct tracecmd_output *handle);
+unsigned long long tracecmd_get_out_file_offset(struct tracecmd_output *handle);
/* --- Reading the Fly Recorder Trace --- */
@@ -53,6 +53,8 @@ void out_compression_reset(struct tracecmd_output *handle, bool compress);
bool out_check_compression(struct tracecmd_output *handle);
void out_set_file_state(struct tracecmd_output *handle, int new_state);
+int out_save_options_offset(struct tracecmd_output *handle,
+ unsigned long long start);
unsigned long long out_copy_fd_compress(struct tracecmd_output *handle,
int fd, unsigned long long max,
unsigned long long *write_size);
@@ -4981,6 +4981,146 @@ int tracecmd_copy_buffer_descr(struct tracecmd_input *in_handle,
return tracecmd_write_buffer_info(out_handle);
}
+static int copy_options_recursive(struct tracecmd_input *in_handle,
+ struct tracecmd_output *out_handle)
+{
+ unsigned short id, flags = 0;
+ unsigned short option, en2;
+ unsigned long long next;
+ unsigned int size, en4;
+ bool skip;
+
+ for (;;) {
+ if (do_read_check(in_handle, &option, 2))
+ return -1;
+ en2 = tep_read_number(in_handle->pevent, &option, 2);
+
+ if (en2 == TRACECMD_OPTION_DONE && !HAS_SECTIONS(in_handle))
+ return 0;
+
+ /* next 4 bytes is the size of the option */
+ if (do_read_check(in_handle, &size, 4))
+ return -1;
+ en4 = tep_read_number(in_handle->pevent, &size, 4);
+ if (en2 == TRACECMD_OPTION_DONE) {
+ /* option done v7 */
+ if (en4 < 8)
+ return -1;
+ if (read8(in_handle, &next))
+ return -1;
+ if (!next)
+ break;
+ if (do_lseek(in_handle, next, SEEK_SET) == (off64_t)-1)
+ return -1;
+ if (read_section_header(in_handle, &id, &flags, NULL, NULL))
+ return -1;
+ if (id != TRACECMD_OPTION_DONE)
+ return -1;
+ if (flags & TRACECMD_SEC_FL_COMPRESS && in_uncompress_block(in_handle))
+ return -1;
+ return copy_options_recursive(in_handle, out_handle);
+ }
+ /* Do not copy these, as they have file specific offsets */
+ switch (en2) {
+ case TRACECMD_OPTION_BUFFER:
+ case TRACECMD_OPTION_BUFFER_TEXT:
+ case TRACECMD_OPTION_HEADER_INFO:
+ case TRACECMD_OPTION_FTRACE_EVENTS:
+ case TRACECMD_OPTION_EVENT_FORMATS:
+ case TRACECMD_OPTION_KALLSYMS:
+ case TRACECMD_OPTION_PRINTK:
+ case TRACECMD_OPTION_CMDLINES:
+ skip = true;
+ break;
+ default:
+ skip = false;
+ break;
+ }
+ if (skip) {
+ do_lseek(in_handle, en4, SEEK_CUR);
+ continue;
+ }
+ if (do_write_check(out_handle, &option, 2))
+ return -1;
+ if (do_write_check(out_handle, &size, 4))
+ return -1;
+ if (read_copy_data(in_handle, en4, out_handle))
+ return -1;
+ }
+
+ return 0;
+}
+
+static int copy_options(struct tracecmd_input *in_handle, struct tracecmd_output *out_handle)
+{
+ unsigned long long offset, start;
+ unsigned short id, en2, flags = 0;
+ int tmp;
+
+ if (HAS_SECTIONS(in_handle)) {
+ if (read_section_header(in_handle, &id, &flags, NULL, NULL))
+ return -1;
+ if (id != TRACECMD_OPTION_DONE)
+ return -1;
+ if (flags & TRACECMD_SEC_FL_COMPRESS && in_uncompress_block(in_handle))
+ return -1;
+ }
+ start = tracecmd_get_out_file_offset(out_handle);
+ if (tracecmd_get_out_file_version(out_handle) < FILE_VERSION_SECTIONS) {
+ if (do_write_check(out_handle, "options ", 10))
+ return -1;
+ }
+
+ offset = out_write_section_header(out_handle, TRACECMD_OPTION_DONE, "options", 0, false);
+
+ if (copy_options_recursive(in_handle, out_handle))
+ goto error;
+
+ id = TRACECMD_OPTION_DONE;
+ en2 = tep_read_number(in_handle->pevent, &id, 2);
+ if (do_write_check(out_handle, &en2, 2))
+ goto error;
+ if (tracecmd_get_out_file_version(out_handle) < FILE_VERSION_SECTIONS) {
+ out_save_options_offset(out_handle, start);
+ } else {
+ tmp = 8;
+ if (do_write_check(out_handle, &tmp, 4))
+ goto error;
+ out_save_options_offset(out_handle, start);
+ start = 0;
+ if (do_write_check(out_handle, &start, 8))
+ goto error;
+ }
+ out_update_section_header(out_handle, offset);
+ if (flags & TRACECMD_SEC_FL_COMPRESS)
+ in_uncompress_reset(in_handle);
+ in_handle->file_state = TRACECMD_FILE_OPTIONS;
+ out_set_file_state(out_handle, in_handle->file_state);
+ /* Append local options */
+ return tracecmd_append_options(out_handle);
+
+error:
+ if (flags & TRACECMD_SEC_FL_COMPRESS)
+ in_uncompress_reset(in_handle);
+ return 0;
+}
+
+int tracecmd_copy_options(struct tracecmd_input *in_handle,
+ struct tracecmd_output *out_handle)
+{
+ if (!check_in_state(in_handle, TRACECMD_FILE_OPTIONS) ||
+ !check_out_state(out_handle, TRACECMD_FILE_OPTIONS))
+ return -1;
+
+ if (!in_handle->options_start)
+ return 0;
+ if (lseek64(in_handle->fd, in_handle->options_start, SEEK_SET) == (off64_t)-1)
+ return -1;
+ if (copy_options(in_handle, out_handle) < 0)
+ return -1;
+ return 0;
+}
+
/**
* tracecmd_record_at_buffer_start - return true if record is first on subbuffer
* @handle: input handle for the trace.dat file
@@ -2621,6 +2621,31 @@ __hidden bool out_check_compression(struct tracecmd_output *handle)
return (handle->compress != NULL);
}
+__hidden int out_save_options_offset(struct tracecmd_output *handle, unsigned long long start)
+{
+ unsigned long long new, en8;
+
+ if (HAS_SECTIONS(handle)) {
+ /* Append to the previous options section, if any */
+ if (!handle->options_start)
+ return -1;
+ new = do_lseek(handle, 0, SEEK_CUR);
+ if (do_lseek(handle, handle->options_start, SEEK_SET) == (off64_t)-1)
+ return -1;
+
+ en8 = convert_endian_8(handle, start);
+ if (do_write_check(handle, &en8, 8))
+ return -1;
+ handle->options_start = new;
+ if (do_lseek(handle, new, SEEK_SET) == (off64_t)-1)
+ return -1;
+ } else {
+ handle->options_start = start;
+ }
+
+ return 0;
+}
+
/**
* tracecmd_get_out_file_version - return the trace.dat file version
* @handle: output handle for the trace.dat file
@@ -2629,3 +2654,8 @@ unsigned long tracecmd_get_out_file_version(struct tracecmd_output *handle)
{
return handle->file_version;
}
+
+unsigned long long tracecmd_get_out_file_offset(struct tracecmd_output *handle)
+{
+ return do_lseek(handle, 0, SEEK_CUR);
+}
A new library API is introduced, to copy options between trace files: tracecmd_copy_options() 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 | 140 ++++++++++++++++++ lib/trace-cmd/trace-output.c | 30 ++++ 4 files changed, 175 insertions(+)