@@ -138,6 +138,12 @@ enum {
TRACECMD_OPTION_TIME_SHIFT,
TRACECMD_OPTION_GUEST,
TRACECMD_OPTION_TSC2NSEC,
+ TRACECMD_OPTION_HEADER_INFO,
+ TRACECMD_OPTION_FTRACE_EVENTS,
+ TRACECMD_OPTION_EVENT_FORMATS,
+ TRACECMD_OPTION_KALLSYMS,
+ TRACECMD_OPTION_PRINTK,
+ TRACECMD_OPTION_CMDLINES,
TRACECMD_OPTION_MAX,
};
@@ -402,10 +402,12 @@ __hidden int out_update_section_header(struct tracecmd_output *handle, unsigned
static int read_header_files(struct tracecmd_output *handle)
{
+ enum tracecmd_section_flags flags = 0;
tsize_t size, check_size, endian8;
struct stat st;
+ tsize_t offset;
char *path;
- int fd;
+ int fd = -1;
int ret;
if (!check_out_state(handle, TRACECMD_FILE_HEADERS)) {
@@ -418,26 +420,33 @@ static int read_header_files(struct tracecmd_output *handle)
if (!path)
return -1;
+ offset = out_write_section_header(handle, TRACECMD_OPTION_HEADER_INFO,
+ "headers", flags, true);
+ if (offset == (off64_t)-1)
+ return -1;
+
ret = stat(path, &st);
if (ret < 0) {
/* old style did not show this info, just add zero */
put_tracing_file(path);
if (do_write_check(handle, "header_page", 12))
- return -1;
+ goto out_close;
size = 0;
if (do_write_check(handle, &size, 8))
- return -1;
+ goto out_close;
if (do_write_check(handle, "header_event", 13))
- return -1;
+ goto out_close;
if (do_write_check(handle, &size, 8))
- return -1;
+ goto out_close;
+ if (out_update_section_header(handle, offset))
+ goto out_close;
return 0;
}
fd = open(path, O_RDONLY);
if (fd < 0) {
tracecmd_warning("can't read '%s'", path);
- return -1;
+ goto out_close;
}
/* unfortunately, you can not stat debugfs files for size */
@@ -453,18 +462,18 @@ static int read_header_files(struct tracecmd_output *handle)
if (size != check_size) {
tracecmd_warning("wrong size for '%s' size=%lld read=%lld", path, size, check_size);
errno = EINVAL;
- return -1;
+ goto out_close;
}
put_tracing_file(path);
path = get_tracing_file(handle, "events/header_event");
if (!path)
- return -1;
+ goto out_close;
fd = open(path, O_RDONLY);
if (fd < 0) {
tracecmd_warning("can't read '%s'", path);
- return -1;
+ goto out_close;
}
size = get_size_fd(fd);
@@ -478,16 +487,18 @@ static int read_header_files(struct tracecmd_output *handle)
close(fd);
if (size != check_size) {
tracecmd_warning("wrong size for '%s'", path);
- return -1;
+ goto out_close;
}
put_tracing_file(path);
-
+ if (out_update_section_header(handle, offset))
+ goto out_close;
handle->file_state = TRACECMD_FILE_HEADERS;
return 0;
out_close:
- close(fd);
+ if (fd >= 0)
+ close(fd);
return -1;
}
@@ -716,8 +727,10 @@ create_event_list_item(struct tracecmd_output *handle,
static int read_ftrace_files(struct tracecmd_output *handle)
{
+ enum tracecmd_section_flags flags = 0;
struct list_event_system *systems = NULL;
struct tracecmd_event_list list = { .glob = "ftrace/*" };
+ tsize_t offset;
int ret;
if (!check_out_state(handle, TRACECMD_FILE_FTRACE_EVENTS)) {
@@ -726,11 +739,20 @@ static int read_ftrace_files(struct tracecmd_output *handle)
return -1;
}
+ offset = out_write_section_header(handle, TRACECMD_OPTION_FTRACE_EVENTS,
+ "ftrace events", flags, true);
+ if (offset == (off64_t)-1)
+ return -1;
+
create_event_list_item(handle, &systems, &list);
ret = copy_event_system(handle, systems);
free_list_events(systems);
+ if (ret)
+ return ret;
+ if (out_update_section_header(handle, offset))
+ return -1;
handle->file_state = TRACECMD_FILE_FTRACE_EVENTS;
@@ -753,11 +775,13 @@ create_event_list(struct tracecmd_output *handle,
static int read_event_files(struct tracecmd_output *handle,
struct tracecmd_event_list *event_list)
{
+ enum tracecmd_section_flags flags = 0;
struct list_event_system *systems;
struct list_event_system *slist;
struct tracecmd_event_list *list;
struct tracecmd_event_list all_events = { .glob = "*/*" };
int count = 0;
+ tsize_t offset;
int endian4;
int ret;
@@ -766,6 +790,11 @@ static int read_event_files(struct tracecmd_output *handle,
handle->file_state);
return -1;
}
+
+ offset = out_write_section_header(handle, TRACECMD_OPTION_EVENT_FORMATS,
+ "events format", flags, true);
+ if (offset == (off64_t)-1)
+ return -1;
/*
* If any of the list is the special keyword "all" then
* just do all files.
@@ -797,9 +826,14 @@ static int read_event_files(struct tracecmd_output *handle,
}
ret = copy_event_system(handle, slist);
}
+ if (ret)
+ goto out_free;
+ ret = out_update_section_header(handle, offset);
- handle->file_state = TRACECMD_FILE_ALL_EVENTS;
out_free:
+ if (!ret)
+ handle->file_state = TRACECMD_FILE_ALL_EVENTS;
+
free_list_events(systems);
return ret;
@@ -847,8 +881,10 @@ err:
static int read_proc_kallsyms(struct tracecmd_output *handle)
{
+ enum tracecmd_section_flags flags = 0;
unsigned int size, check_size, endian4;
const char *path = "/proc/kallsyms";
+ tsize_t offset;
struct stat st;
int ret;
@@ -861,19 +897,24 @@ static int read_proc_kallsyms(struct tracecmd_output *handle)
if (handle->kallsyms)
path = handle->kallsyms;
+ offset = out_write_section_header(handle, TRACECMD_OPTION_KALLSYMS,
+ "kallsyms", flags, true);
+ if (offset == (off64_t)-1)
+ return -1;
+
ret = stat(path, &st);
if (ret < 0) {
/* not found */
size = 0;
endian4 = convert_endian_4(handle, size);
- if (do_write_check(handle, &endian4, 4))
- return -1;
- return 0;
+ ret = do_write_check(handle, &endian4, 4);
+ goto out;
}
size = get_size(path);
endian4 = convert_endian_4(handle, size);
- if (do_write_check(handle, &endian4, 4))
- return -1;
+ ret = do_write_check(handle, &endian4, 4);
+ if (ret)
+ goto out;
set_proc_kptr_restrict(0);
check_size = copy_file(handle, path);
@@ -881,18 +922,23 @@ static int read_proc_kallsyms(struct tracecmd_output *handle)
errno = EINVAL;
tracecmd_warning("error in size of file '%s'", path);
set_proc_kptr_restrict(1);
- return -1;
+ ret = -1;
+ goto out;
}
set_proc_kptr_restrict(1);
- handle->file_state = TRACECMD_FILE_KALLSYMS;
-
- return 0;
+ ret = out_update_section_header(handle, offset);
+out:
+ if (!ret)
+ handle->file_state = TRACECMD_FILE_KALLSYMS;
+ return ret;
}
static int read_ftrace_printk(struct tracecmd_output *handle)
{
+ enum tracecmd_section_flags flags = 0;
unsigned int size, check_size, endian4;
+ tsize_t offset;
struct stat st;
char *path;
int ret;
@@ -907,6 +953,10 @@ static int read_ftrace_printk(struct tracecmd_output *handle)
if (!path)
return -1;
+ offset = out_write_section_header(handle, TRACECMD_OPTION_PRINTK, "printk", flags, true);
+ if (offset == (off64_t)-1)
+ return -1;
+
ret = stat(path, &st);
if (ret < 0) {
/* not found */
@@ -928,8 +978,10 @@ static int read_ftrace_printk(struct tracecmd_output *handle)
}
out:
- handle->file_state = TRACECMD_FILE_PRINTK;
put_tracing_file(path);
+ if (out_update_section_header(handle, offset))
+ return -1;
+ handle->file_state = TRACECMD_FILE_PRINTK;
return 0;
fail:
put_tracing_file(path);
@@ -1520,6 +1572,8 @@ static tsize_t get_buffer_file_offset(struct tracecmd_output *handle, const char
int tracecmd_write_cmdlines(struct tracecmd_output *handle)
{
+ enum tracecmd_section_flags flags = 0;
+ tsize_t offset;
int ret;
if (!check_out_state(handle, TRACECMD_FILE_CMD_LINES)) {
@@ -1527,9 +1581,19 @@ int tracecmd_write_cmdlines(struct tracecmd_output *handle)
handle->file_state);
return -1;
}
+
+ offset = out_write_section_header(handle, TRACECMD_OPTION_CMDLINES,
+ "command lines", flags, true);
+ if (offset == (off64_t)-1)
+ return -1;
+
ret = save_tracing_file_data(handle, "saved_cmdlines");
if (ret < 0)
return ret;
+
+ if (out_update_section_header(handle, offset))
+ return -1;
+
handle->file_state = TRACECMD_FILE_CMD_LINES;
return 0;
}
Headers are added before these file sections, in trace file version 7: - ftrace events format - format of recorded events - information of the mapping of function addresses to the function names - trace_printk() format strings - information of the mapping a PID to a process name New options are defined for each of these sections, holding the section's offset into the trace file. Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> --- .../include/private/trace-cmd-private.h | 6 + lib/trace-cmd/trace-output.c | 110 ++++++++++++++---- 2 files changed, 93 insertions(+), 23 deletions(-)