diff mbox series

[14/38] trace-cmd: Simplify msg_free() by using min sizes

Message ID	20180103175336.845166833@goodmis.org (mailing list archive)
State	Superseded, archived
Headers	show Return-Path: linux-trace-devel-owner@vger.kernel.org Received: from mail.kernel.org ([198.145.29.99]:35598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751024AbeACRxi (ORCPT <rfc822;linux-trace-devel@vger.kernel.org>); Wed, 3 Jan 2018 12:53:38 -0500 Message-Id: <20180103175336.845166833@goodmis.org> Date: Wed, 03 Jan 2018 12:52:16 -0500 From: Steven Rostedt <rostedt@goodmis.org> To: linux-trace-devel@vger.kernel.org Subject: [PATCH 14/38] trace-cmd: Simplify msg_free() by using min sizes References: <20180103175202.044283643@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0014-trace-cmd-Simplify-msg_free-by-using-min-sizes.patch Sender: linux-trace-devel-owner@vger.kernel.org List-ID: <linux-trace-devel.vger.kernel.org>
Series	trace-cmd: Simplify the msg handling \| expand [00/38] trace-cmd: Simplify the msg handling [01/38] trace-cmd recorder: Check if pipe_size was modified by fcntl(F_GETPIPE_SZ) [02/38] pevent: Simplify pointer print logic and fix %pF [03/38] pevent: Handle new pointer processing of bprint strings [04/38] trace-cmd record: Fix clearing out the ctx->instance when used in for_all_instances() [05/38] trace-cmd: Remove the creating of msg out of tracecmd_msg_send() [06/38] trace-cmd: Move tracecmd_msg_send_and_wait_for_msg() into its only user [07/38] trace-cmd: Turn tracecmd_msg data into an anonymous union [08/38] trace-cmd: Remove unused structure tracecmd_msg_error [09/38] trace-cmd: Move size and cmd in tracecmd_msg into its own header struct [10/38] trace-cmd: Move the tracecmd_msg pointers into their own union [11/38] trace-cmd: Just use the buf field for sending pointers [12/38] trace-cmd: Use an array to map msg types and min sizes [13/38] trace-cmd: Merge msg_do_write_check() into msg_write() [14/38] trace-cmd: Simplify msg_free() by using min sizes [15/38] trace-cmd: Add tracecmd_msg_init() helper function [16/38] trace-cmd: Remove mulitplexer tracecmd_msg_create() [17/38] trace-cmd: Simplify msg_read_extra() [18/38] trace-cmd: Have msg_free() zero out msg contents [19/38] trace-cmd: Verify RINIT was received after TINIT msg sent [20/38] trace-cmd: Make send_metadata a flag in the output handle [21/38] trace-cmd: Pass cpu count and port array to make_rinit() [22/38] trace-cmd: Pass cpu_count instead of having it as a global [23/38] trace-cmd: Pass in client_ports instead of using a global variable [24/38] trace-cmd msg: Add debug prints of messages sent and received [25/38] trace-cmd msg: Move the saved closing fd to the caller [26/38] trace-cmd listen: Add better output on error of connections [27/38] trace-cmd msg: Create a msg_handle to pass around for saved state [28/38] trace-cmd msg: Add server structure of msg_handler [29/38] trace-cmd: Remove global use_tcp variable [30/38] trace-cmd: Move protocol version into msg_handler [31/38] tracecmd: Clean up handling of cpu_count [32/38] tracecmd listen: Have pagesize passed as return not parameter [33/38] trace-cmd: Have cpu_count reside in instances and not be global [34/38] trace-cmd: Add option CPUCOUNT to buffer instance options [35/38] trace-cmd: Have msg_handle part of the buffer instance [36/38] trace-cmd record: Allow instances to be recorded over the network [37/38] trace-cmd: Have keep and profile be flags of buffer instance [38/38] trace-cmd: Add network handle into buffer instance

Commit Message

Steven Rostedt Jan. 3, 2018, 5:52 p.m. UTC

From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>

msg_free() only needs to free the extra data pointer if the min_size for the
command is something greater than zero.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 trace-msg.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff mbox series

Patch

diff --git a/trace-msg.c b/trace-msg.c
index 943eaa5bf15c..406f44105470 100644
--- a/trace-msg.c
+++ b/trace-msg.c
@@ -249,17 +249,11 @@  static int tracecmd_msg_create(u32 cmd, struct tracecmd_msg *msg)
 
 static void msg_free(struct tracecmd_msg *msg)
 {
-	switch (ntohl(msg->hdr.cmd)) {
-	case MSG_TINIT:
-		free(msg->opt);
-		break;
-	case MSG_RINIT:
-		free(msg->port_array);
-		break;
-	case MSG_SENDMETA:
+	int cmd = ntohl(msg->hdr.cmd);
+
+	/* If a min size is defined, then the buf needs to be freed */
+	if (cmd < MSG_FINMETA && (msg_min_sizes[cmd] > 0))
 		free(msg->buf);
-		break;
-	}
 }
 
 static int tracecmd_msg_send(int fd, struct tracecmd_msg *msg)