@@ -154,6 +154,7 @@ enum {
TRACECMD_FL_BUFFER_INSTANCE = (1 << 1),
TRACECMD_FL_IN_USECS = (1 << 2),
TRACECMD_FL_RAW_TS = (1 << 3),
+ TRACECMD_FL_SECTIONED = (1 << 4),
};
struct tracecmd_ftrace {
@@ -165,8 +165,7 @@ struct tracecmd_input {
struct file_section *sections;
size_t header_files_start;
size_t ftrace_files_start;
- size_t event_files_start;
- size_t options_start;
+ unsigned long long options_start;
size_t total_file_size;
/* For custom profilers. */
@@ -176,6 +175,7 @@ struct tracecmd_input {
__thread struct tracecmd_input *tracecmd_curr_thread_handle;
#define CHECK_READ_STATE(H, S) ((H)->file_version < FILE_VERSION_SECTIONS && (H)->file_state >= (S))
+#define HAS_SECTIONS(H) ((H)->flags & TRACECMD_FL_SECTIONED)
static int read_options_type(struct tracecmd_input *handle);
@@ -448,6 +448,10 @@ static int read_header_files(struct tracecmd_input *handle)
if (CHECK_READ_STATE(handle, TRACECMD_FILE_HEADERS))
return 0;
+ if (!HAS_SECTIONS(handle))
+ section_add_or_update(handle, TRACECMD_OPTION_HEADER_INFO, 0, 0,
+ lseek64(handle->fd, 0, SEEK_CUR));
+
if (do_read_check(handle, buf, 12))
return -1;
@@ -491,9 +495,6 @@ static int read_header_files(struct tracecmd_input *handle)
free(header);
- handle->ftrace_files_start =
- lseek64(handle->fd, 0, SEEK_CUR);
-
handle->file_state = TRACECMD_FILE_HEADERS;
return 0;
@@ -654,6 +655,10 @@ static int read_ftrace_files(struct tracecmd_input *handle, const char *regex)
if (CHECK_READ_STATE(handle, TRACECMD_FILE_FTRACE_EVENTS))
return 0;
+ if (!HAS_SECTIONS(handle))
+ section_add_or_update(handle, TRACECMD_OPTION_FTRACE_EVENTS, 0, 0,
+ lseek64(handle->fd, 0, SEEK_CUR));
+
if (regex) {
sreg = &spreg;
ereg = &epreg;
@@ -694,8 +699,6 @@ static int read_ftrace_files(struct tracecmd_input *handle, const char *regex)
goto out;
}
- handle->event_files_start =
- lseek64(handle->fd, 0, SEEK_CUR);
handle->file_state = TRACECMD_FILE_FTRACE_EVENTS;
ret = 0;
out:
@@ -727,6 +730,10 @@ static int read_event_files(struct tracecmd_input *handle, const char *regex)
if (CHECK_READ_STATE(handle, TRACECMD_FILE_ALL_EVENTS))
return 0;
+ if (!HAS_SECTIONS(handle))
+ section_add_or_update(handle, TRACECMD_OPTION_EVENT_FORMATS, 0, 0,
+ lseek64(handle->fd, 0, SEEK_CUR));
+
if (regex) {
sreg = &spreg;
ereg = &epreg;
@@ -810,6 +817,9 @@ static int read_proc_kallsyms(struct tracecmd_input *handle)
if (CHECK_READ_STATE(handle, TRACECMD_FILE_KALLSYMS))
return 0;
+ if (!HAS_SECTIONS(handle))
+ section_add_or_update(handle, TRACECMD_OPTION_KALLSYMS, 0, 0,
+ lseek64(handle->fd, 0, SEEK_CUR));
if (read4(handle, &size) < 0)
return -1;
@@ -844,6 +854,10 @@ static int read_ftrace_printk(struct tracecmd_input *handle)
if (CHECK_READ_STATE(handle, TRACECMD_FILE_PRINTK))
return 0;
+ if (!HAS_SECTIONS(handle))
+ section_add_or_update(handle, TRACECMD_OPTION_PRINTK, 0, 0,
+ lseek64(handle->fd, 0, SEEK_CUR));
+
if (read4(handle, &size) < 0)
return -1;
if (!size) {
@@ -2876,6 +2890,18 @@ static int handle_options(struct tracecmd_input *handle)
handle->tsc_calc.offset = tep_read_number(handle->pevent,
buf + 8, 8);
break;
+ 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:
+ if (size < 8)
+ break;
+ section_add_or_update(handle, option, -1,
+ tep_read_number(handle->pevent, buf, 8), 0);
+ break;
+
default:
tracecmd_warning("unknown option %d", option);
break;
@@ -3060,6 +3086,11 @@ static int read_and_parse_cmdlines(struct tracecmd_input *handle)
if (CHECK_READ_STATE(handle, TRACECMD_FILE_CMD_LINES))
return 0;
+ if (!HAS_SECTIONS(handle))
+ section_add_or_update(handle, TRACECMD_OPTION_CMDLINES, 0, 0,
+ lseek64(handle->fd, 0, SEEK_CUR));
+
+
if (read_data_and_size(handle, &cmdlines, &size) < 0)
return -1;
cmdlines[size] = 0;
@@ -3349,6 +3380,7 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd, int flags)
struct tracecmd_input *handle;
char test[] = TRACECMD_MAGIC;
unsigned int page_size;
+ size_t offset;
char *version;
char buf[BUFSIZ];
unsigned long ver;
@@ -3388,6 +3420,9 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd, int flags)
handle->file_version = ver;
free(version);
+ if (handle->file_version >= FILE_VERSION_SECTIONS)
+ handle->flags |= TRACECMD_FL_SECTIONED;
+
if (do_read_check(handle, buf, 1))
goto failed_read;
@@ -3412,14 +3447,16 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd, int flags)
read4(handle, &page_size);
handle->page_size = page_size;
- handle->header_files_start =
- lseek64(handle->fd, 0, SEEK_CUR);
-
- handle->total_file_size =
- lseek64(handle->fd, 0, SEEK_END);
+ offset = lseek64(handle->fd, 0, SEEK_CUR);
+ handle->total_file_size = lseek64(handle->fd, 0, SEEK_END);
+ lseek64(handle->fd, offset, SEEK_SET);
- handle->header_files_start =
- lseek64(handle->fd, handle->header_files_start, SEEK_SET);
+ if (HAS_SECTIONS(handle)) {
+ if (read8(handle, &(handle->options_start))) {
+ tracecmd_warning("Filed to read the offset of the first option section");
+ goto failed_read;
+ }
+ }
handle->file_state = TRACECMD_FILE_INIT;
Add sections in internal database on file reading and parsing. In trace file version 7, sections are initialized when parsing corresponding trace options. In version 6 files, sections are retrieved on file reading, as there they are in a fixed position in the file. Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> --- .../include/private/trace-cmd-private.h | 1 + lib/trace-cmd/trace-input.c | 65 +++++++++++++++---- 2 files changed, 52 insertions(+), 14 deletions(-)