diff mbox series

[15/38] trace-cmd: Add tracecmd_msg_init() helper function

Message ID	20180103175336.982581934@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]:35494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751160AbeACRxi (ORCPT <rfc822;linux-trace-devel@vger.kernel.org>); Wed, 3 Jan 2018 12:53:38 -0500 Message-Id: <20180103175336.982581934@goodmis.org> Date: Wed, 03 Jan 2018 12:52:17 -0500 From: Steven Rostedt <rostedt@goodmis.org> To: linux-trace-devel@vger.kernel.org Subject: [PATCH 15/38] trace-cmd: Add tracecmd_msg_init() helper function References: <20180103175202.044283643@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0015-trace-cmd-Add-tracecmd_msg_init-helper-function.patch Sender: linux-trace-devel-owner@vger.kernel.org List-ID: <linux-trace-devel.vger.kernel.org> Content-Length: 1298
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>

We will eventually be getting rid of tracecmd_msg_create() multiplexer and
having separate functions for creating different msg types. This will
require having a generic tracecmd_msg_init() to initialize the msg to a
default state.

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

diff mbox series

Patch

diff --git a/trace-msg.c b/trace-msg.c
index 406f44105470..5c55eae8f4b3 100644
--- a/trace-msg.c
+++ b/trace-msg.c
@@ -219,6 +219,13 @@  static int make_rinit(struct tracecmd_msg *msg)
 	return 0;
 }
 
+static void tracecmd_msg_init(u32 cmd, struct tracecmd_msg *msg)
+{
+	memset(msg, 0, sizeof(*msg));
+	msg->hdr.cmd = htonl(cmd);
+	msg->hdr.size = htonl(MSG_HDR_LEN);
+}
+
 static int tracecmd_msg_create(u32 cmd, struct tracecmd_msg *msg)
 {
 	int ret = 0;
@@ -228,8 +235,7 @@  static int tracecmd_msg_create(u32 cmd, struct tracecmd_msg *msg)
 		return -EINVAL;
 	}
 
-	memset(msg, 0, sizeof(*msg));
-	msg->hdr.cmd = htonl(cmd);
+	tracecmd_msg_init(cmd, msg);
 
 	switch (cmd) {
 	case MSG_TINIT:
@@ -242,8 +248,6 @@  static int tracecmd_msg_create(u32 cmd, struct tracecmd_msg *msg)
 		break;
 	}
 
-	msg->hdr.size = htonl(MSG_HDR_LEN);
-
 	return ret;
 }