All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v3 13/25] trace-cmd library: Inherit compression algorithm from input file
Date: Wed, 12 May 2021 09:38:11 +0300	[thread overview]
Message-ID: <20210512063823.324610-14-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20210512063823.324610-1-tz.stoyanov@gmail.com>

When a new trace file output handler is allocated, based on given trace
file input handler - use the same compression algorithm.

Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
 lib/trace-cmd/trace-output.c | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
index 627cea42..ea90ef75 100644
--- a/lib/trace-cmd/trace-output.c
+++ b/lib/trace-cmd/trace-output.c
@@ -980,17 +980,27 @@ out_free:
 static int select_file_version(struct tracecmd_output *handle,
 				struct tracecmd_input *ihandle)
 {
+	const char *cname = NULL;
+	const char *cver = NULL;
+
 	if (ihandle) {
 		handle->file_version = tracecmd_get_file_version(ihandle);
-	} else {
-		handle->compress = tracecmd_compress_alloc(NULL, NULL, handle->fd,
-							   handle->pevent, handle->msg_handle);
-		if (handle->compress)
-			handle->file_version = 7;
-		else
-			handle->file_version = 6;
+		if (!tracecmd_get_file_compress_proto(ihandle, &cname, &cver)) {
+			handle->compress = tracecmd_compress_alloc(cname, cver, handle->fd,
+								   handle->pevent, handle->msg_handle);
+			if (!handle->compress)
+				return -1;
+		}
+		return 0;
 	}
 
+	handle->compress = tracecmd_compress_alloc(NULL, NULL, handle->fd,
+						   handle->pevent, handle->msg_handle);
+	if (handle->compress)
+		handle->file_version = 7;
+	else
+		handle->file_version = 6;
+
 	return 0;
 }
 
@@ -1645,6 +1655,8 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd)
 {
 	struct tracecmd_output *handle = NULL;
 	struct tracecmd_input *ihandle;
+	const char *cname = NULL;
+	const char *cver = NULL;
 	int fd2;
 
 	/* Move the file descriptor to the beginning */
@@ -1682,6 +1694,12 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd)
 	handle->file_version = tracecmd_get_file_version(ihandle);
 	list_head_init(&handle->options);
 
+	if (!tracecmd_get_file_compress_proto(ihandle, &cname, &cver)) {
+		handle->compress = tracecmd_compress_alloc(cname, cver, handle->fd,
+							   handle->pevent, handle->msg_handle);
+		if (!handle->compress)
+			goto out_free;
+	}
 	tracecmd_close(ihandle);
 
 	return handle;
-- 
2.31.1


  parent reply	other threads:[~2021-05-12  6:38 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-12  6:37 [PoC PATCH v3 00/25] Add trace file compression Tzvetomir Stoyanov (VMware)
2021-05-12  6:37 ` [PATCH v3 01/25] trace-cmd library: Remove unused private APIs for creating trace files Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 02/25] trace-cmd library: Remove unused API tracecmd_update_option Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 03/25] trace-cmd: Check if file version is supported Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 04/25] trace-cmd library: Add new API to get file version of input handler Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 05/25] trace-cmd library: Select the file version when writing trace file Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 06/25] trace-cmd: Add APIs for library initialization and free Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 07/25] trace-cmd library: Add support for compression algorithms Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 08/25] trace-cmd list: Show supported " Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 09/25] trace-cmd library: Bump the trace file version to 7 Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 10/25] trace-cmd library: Compress part of the trace file Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 11/25] trace-cmd library: Read compressed " Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 12/25] trace-cmd library: Add new API to get compression of input handler Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` Tzvetomir Stoyanov (VMware) [this message]
2021-05-12  6:38 ` [PATCH v3 14/25] trace-cmd library: Extend the create file APIs to support different compression Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 15/25] trace-cmd record: Add new parameter --compression Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 16/25] trace-cmd dump: Add support for trace files version 7 Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 17/25] trace-cmd library: Add support for zlib compression library Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 18/25] trace-cmd library: Hide the logic for updating buffer offset Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 19/25] trace-cmd: Move buffers description outside of options Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 20/25] trace-cmd library: Track the offset in the option section in the trace file Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 21/25] trace-cmd library: Add compression of the option section of " Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 22/25] trace-cmd library: Refactor the logic for writing trace data in the file Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 23/25] trace-cmd library: Add APIs for read and write compressed data in chunks Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 24/25] trace-cmd: Compress trace data Tzvetomir Stoyanov (VMware)
2021-05-12  6:38 ` [PATCH v3 25/25] trace-cmd: Read compressed " Tzvetomir Stoyanov (VMware)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210512063823.324610-14-tz.stoyanov@gmail.com \
    --to=tz.stoyanov@gmail.com \
    --cc=linux-trace-devel@vger.kernel.org \
    --cc=rostedt@goodmis.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.