@@ -114,6 +114,14 @@ struct tsc2nsec {
unsigned long long offset;
};
+struct file_section {
+ int id;
+ unsigned long long section_offset;
+ unsigned long long data_offset;
+ enum tracecmd_section_flags flags;
+ struct file_section *next;
+};
+
struct tracecmd_input {
struct tep_handle *pevent;
unsigned long file_state;
@@ -154,6 +162,7 @@ struct tracecmd_input {
struct hook_list *hooks;
struct pid_addr_maps *pid_maps;
/* file information */
+ struct file_section *sections;
size_t header_files_start;
size_t ftrace_files_start;
size_t event_files_start;
@@ -411,6 +420,61 @@ __hidden int in_uncompress_block(struct tracecmd_input *handle)
return ret;
}
+static struct file_section *get_section(struct tracecmd_input *handle, int id)
+{
+ struct file_section *sec = handle->sections;
+
+ while (sec) {
+ if (sec->id == id)
+ return sec;
+ sec = sec->next;
+ }
+ return NULL;
+}
+
+static struct file_section *open_section(struct tracecmd_input *handle, int id)
+{
+ struct file_section *sec = get_section(handle, id);
+
+ if (!sec)
+ return NULL;
+
+ if (lseek64(handle->fd, sec->data_offset, SEEK_SET) == (off64_t)-1)
+ return NULL;
+ if ((sec->flags & TRACECMD_SEC_FL_COMPRESS) && in_uncompress_block(handle))
+ return NULL;
+ return sec;
+}
+
+static void close_section(struct tracecmd_input *handle, struct file_section *sec)
+{
+ if (sec->flags & TRACECMD_SEC_FL_COMPRESS)
+ in_uncompress_reset(handle);
+}
+
+static int add_section(struct tracecmd_input *handle, int id, int flags,
+ unsigned long long soffset, unsigned long long doffset)
+{
+ struct file_section *sec = get_section(handle, id);
+
+ if (!sec) {
+ sec = calloc(1, sizeof(struct file_section));
+ if (!sec)
+ return -1;
+ sec->next = handle->sections;
+ handle->sections = sec;
+ }
+ sec->id = id;
+ if (soffset)
+ sec->section_offset = soffset;
+ if (doffset)
+ sec->data_offset = doffset;
+ if (flags > 0)
+ sec->flags = flags;
+ return 0;
+}
+
+
static int read_header_files(struct tracecmd_input *handle)
{
struct tep_handle *pevent = handle->pevent;
@@ -3522,6 +3586,7 @@ void tracecmd_ref(struct tracecmd_input *handle)
*/
void tracecmd_close(struct tracecmd_input *handle)
{
+ struct file_section *del_sec;
int i;
if (!handle)
@@ -3560,6 +3625,11 @@ void tracecmd_close(struct tracecmd_input *handle)
free(handle->version);
close(handle->fd);
+ while (handle->sections) {
+ del_sec = handle->sections;
+ handle->sections = handle->sections->next;
+ free(del_sec);
+ }
for (i = 0; i < handle->nr_buffers; i++)
free(handle->buffers[i].name);
@@ -4006,6 +4076,7 @@ tracecmd_buffer_instance_handle(struct tracecmd_input *handle, int indx)
new_handle->nr_buffers = 0;
new_handle->buffers = NULL;
new_handle->version = NULL;
+ new_handle->sections = NULL;
new_handle->guest = NULL;
new_handle->ref = 1;
if (handle->trace_clock) {
Trace file version 7 is based on sections. Added an internal sections database and new helper functions to add, read, open and close file sections. Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> --- lib/trace-cmd/trace-input.c | 71 +++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)