[PATCH v4 3/6] libtracecmd: Add write_compress_section_header() for writing compress sections

From: "Steven Rostedt (Google)" <[email protected]>

All the functions that write compressed sections has a "compress" parameter
this is set when the handle->compress is set. But this is redundant and
can be removed.

There's one function that still calls tcmd_out_write_section_header()
without the compress flag set and that's write_options_start() as the
options section is never compressed.

Since all the other functions compress their sections, add a wrapper
function write_compress_section_header() that calls
tcmd_out_write_section_header() with its compress flag set, and have those
functions use the wrapper.

Signed-off-by: Steven Rostedt (Google) <[email protected]>
---
 lib/trace-cmd/trace-output.c | 93 +++++++++++++-----------------------
 1 file changed, 34 insertions(+), 59 deletions(-)

diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
index b477788b2365..ec72011dc2ad 100644
--- a/lib/trace-cmd/trace-output.c
+++ b/lib/trace-cmd/trace-output.c
@@ -549,6 +549,14 @@ tcmd_out_write_section_header(struct tracecmd_output *handle, unsigned short hea
 	return offset;
 }
 
+static unsigned long long
+write_compress_section_header(struct tracecmd_output *handle, unsigned short header_id,
+			      char *description, bool option)
+{
+	return tcmd_out_write_section_header(handle, header_id, description,
+					     TRACECMD_SEC_FL_COMPRESS, option);
+}
+
 __hidden int tcmd_out_update_section_header(struct tracecmd_output *handle, tsize_t offset)
 {
 	tsize_t current;
@@ -612,7 +620,6 @@ static int update_endian_4(struct tracecmd_output *handle,
 
 static int save_string_section(struct tracecmd_output *handle)
 {
-	enum tracecmd_section_flags flags = TRACECMD_SEC_FL_COMPRESS;
 	tsize_t offset;
 
 	if (!handle->strings || !handle->strings_p)
@@ -624,7 +631,7 @@ static int save_string_section(struct tracecmd_output *handle)
 		return -1;
 	}
 
-	offset = tcmd_out_write_section_header(handle, TRACECMD_OPTION_STRINGS, "strings", flags, false);
+	offset = write_compress_section_header(handle, TRACECMD_OPTION_STRINGS, "strings", false);
 	if (offset == (off_t)-1)
 		return -1;
 
@@ -651,9 +658,8 @@ error:
 	return -1;
 }
 
-static int read_header_files(struct tracecmd_output *handle, bool compress)
+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;
@@ -671,10 +677,8 @@ static int read_header_files(struct tracecmd_output *handle, bool compress)
 	if (!path)
 		return -1;
 
-	if (compress)
-		flags |= TRACECMD_SEC_FL_COMPRESS;
-	offset = tcmd_out_write_section_header(handle, TRACECMD_OPTION_HEADER_INFO,
-					       "headers", flags, true);
+	offset = write_compress_section_header(handle, TRACECMD_OPTION_HEADER_INFO,
+					       "headers", true);
 	if (offset == (off_t)-1) {
 		put_tracing_file(path);
 		return -1;
@@ -992,9 +996,8 @@ create_event_list_item(struct tracecmd_output *handle,
 	 tracecmd_warning("Insufficient memory");
 }
 
-static int read_ftrace_files(struct tracecmd_output *handle, bool compress)
+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;
@@ -1006,10 +1009,8 @@ static int read_ftrace_files(struct tracecmd_output *handle, bool compress)
 		return -1;
 	}
 
-	if (compress)
-		flags |= TRACECMD_SEC_FL_COMPRESS;
-	offset = tcmd_out_write_section_header(handle, TRACECMD_OPTION_FTRACE_EVENTS,
-					       "ftrace events", flags, true);
+	offset = write_compress_section_header(handle, TRACECMD_OPTION_FTRACE_EVENTS,
+					       "ftrace events", true);
 	if (offset == (off_t)-1)
 		return -1;
 
@@ -1047,9 +1048,8 @@ create_event_list(struct tracecmd_output *handle,
 }
 
 static int read_event_files(struct tracecmd_output *handle,
-			    struct tracecmd_event_list *event_list, bool compress)
+			    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;
@@ -1065,10 +1065,8 @@ static int read_event_files(struct tracecmd_output *handle,
 		return -1;
 	}
 
-	if (compress)
-		flags |= TRACECMD_SEC_FL_COMPRESS;
-	offset = tcmd_out_write_section_header(handle, TRACECMD_OPTION_EVENT_FORMATS,
-					       "events format", flags, true);
+	offset = write_compress_section_header(handle, TRACECMD_OPTION_EVENT_FORMATS,
+					       "events format", true);
 	if (offset == (off_t)-1)
 		return -1;
 	/*
@@ -1161,9 +1159,8 @@ err:
 		tracecmd_warning("can't set kptr_restrict");
 }
 
-static int read_proc_kallsyms(struct tracecmd_output *handle, bool compress)
+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";
 	off_t size_offset;
@@ -1180,10 +1177,8 @@ static int read_proc_kallsyms(struct tracecmd_output *handle, bool compress)
 	if (handle->kallsyms)
 		path = handle->kallsyms;
 
-	if (compress)
-		flags |= TRACECMD_SEC_FL_COMPRESS;
-	offset = tcmd_out_write_section_header(handle, TRACECMD_OPTION_KALLSYMS,
-					       "kallsyms", flags, true);
+	offset = write_compress_section_header(handle, TRACECMD_OPTION_KALLSYMS,
+					       "kallsyms", true);
 	if (offset == (off_t)-1)
 		return -1;
 
@@ -1228,9 +1223,8 @@ out:
 	return ret;
 }
 
-static int read_ftrace_printk(struct tracecmd_output *handle, bool compress)
+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;
@@ -1247,9 +1241,7 @@ static int read_ftrace_printk(struct tracecmd_output *handle, bool compress)
 	if (!path)
 		return -1;
 
-	if (compress)
-		flags |= TRACECMD_SEC_FL_COMPRESS;
-	offset = tcmd_out_write_section_header(handle, TRACECMD_OPTION_PRINTK, "printk", flags, true);
+	offset = write_compress_section_header(handle, TRACECMD_OPTION_PRINTK, "printk", true);
 	if (offset == (off_t)-1) {
 		put_tracing_file(path);
 		return -1;
@@ -1715,25 +1707,21 @@ static int output_write_init(struct tracecmd_output *handle)
 int tracecmd_output_write_headers(struct tracecmd_output *handle,
 				  struct tracecmd_event_list *list)
 {
-	bool compress = false;
-
 	if (!handle || handle->file_state < TRACECMD_FILE_ALLOCATED)
 		return -1;
 
 	/* Write init data, if not written yet */
 	if (handle->file_state < TRACECMD_FILE_INIT && output_write_init(handle))
 		return -1;
-	if (handle->compress)
-		compress = true;
-	if (read_header_files(handle, compress))
+	if (read_header_files(handle))
 		return -1;
-	if (read_ftrace_files(handle, compress))
+	if (read_ftrace_files(handle))
 		return -1;
-	if (read_event_files(handle, list, compress))
+	if (read_event_files(handle, list))
 		return -1;
-	if (read_proc_kallsyms(handle, compress))
+	if (read_proc_kallsyms(handle))
 		return -1;
-	if (read_ftrace_printk(handle, compress))
+	if (read_ftrace_printk(handle))
 		return -1;
 	return 0;
 }
@@ -2304,8 +2292,6 @@ 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;
-	bool compress = false;
 	tsize_t offset;
 	int ret;
 
@@ -2315,13 +2301,8 @@ int tracecmd_write_cmdlines(struct tracecmd_output *handle)
 		return -1;
 	}
 
-	if (handle->compress)
-		compress = true;
-
-	if (compress)
-		flags |= TRACECMD_SEC_FL_COMPRESS;
-	offset = tcmd_out_write_section_header(handle, TRACECMD_OPTION_CMDLINES,
-					       "command lines", flags, true);
+	offset = write_compress_section_header(handle, TRACECMD_OPTION_CMDLINES,
+					       "command lines", true);
 	if (offset == (off_t)-1)
 		return -1;
 
@@ -2456,7 +2437,6 @@ tcmd_out_add_buffer_option(struct tracecmd_output *handle, const char *name,
 struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus,
 						     int file_version, const char *compression)
 {
-	enum tracecmd_section_flags flags = 0;
 	struct tracecmd_output *handle;
 	tsize_t offset;
 	char *path;
@@ -2508,11 +2488,9 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in
 	    !tcmd_out_add_buffer_option(handle, "", TRACECMD_OPTION_BUFFER_TEXT,
 				   offset, 0, NULL, getpagesize()))
 		goto out_free;
-	if (handle->compress)
-		flags |= TRACECMD_SEC_FL_COMPRESS;
 
-	offset = tcmd_out_write_section_header(handle, TRACECMD_OPTION_BUFFER_TEXT,
-					       "buffer latency", flags, false);
+	offset = write_compress_section_header(handle, TRACECMD_OPTION_BUFFER_TEXT,
+					       "buffer latency", false);
 
 	copy_file_compress(handle, path, NULL);
 	if (tcmd_out_update_section_header(handle, offset))
@@ -2631,7 +2609,6 @@ __hidden int tcmd_out_write_cpu_data(struct tracecmd_output *handle,
 				     const char *buff_name)
 {
 	struct data_file_write *data_files = NULL;
-	enum tracecmd_section_flags flags = 0;
 	tsize_t data_offs, offset;
 	unsigned long long endian8;
 	unsigned long long read_size;
@@ -2661,11 +2638,9 @@ __hidden int tcmd_out_write_cpu_data(struct tracecmd_output *handle,
 	if (!HAS_SECTIONS(handle) && tcmd_do_write_check(handle, "flyrecord", 10))
 		goto out_free;
 
-	if (handle->compress)
-		flags |= TRACECMD_SEC_FL_COMPRESS;
 	if (asprintf(&str, "buffer flyrecord %s", buff_name) < 1)
 		goto out_free;
-	offset = tcmd_out_write_section_header(handle, TRACECMD_OPTION_BUFFER, str, flags, false);
+	offset = write_compress_section_header(handle, TRACECMD_OPTION_BUFFER, str, false);
 	free(str);
 	if (offset == (off_t)-1)
 		goto out_free;
@@ -2749,7 +2724,7 @@ __hidden int tcmd_out_write_cpu_data(struct tracecmd_output *handle,
 		if (!tracecmd_get_quiet(handle)) {
 			fprintf(stderr, "    %llu bytes in size",
 				(unsigned long long)data_files[i].write_size);
-			if (flags & TRACECMD_SEC_FL_COMPRESS)
+			if (handle->compress)
 				fprintf(stderr, " (%llu uncompressed)",
 					(unsigned long long)data_files[i].file_size);
 			fprintf(stderr, "\n");
-- 
2.51.0