From 616ad1e20a8941e6c65cdd74470324a88a02af94 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 8 Mar 2017 22:42:04 -0500 Subject: [PATCH] Don't duplicate the lttng_trigger_comm structure in protocol MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/cmd.c | 2 +- src/common/sessiond-comm/sessiond-comm.h | 2 +- src/lib/lttng-ctl/lttng-ctl.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index a3c680aff..749368cd2 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -3578,7 +3578,7 @@ int cmd_register_trigger(struct command_ctx *cmd_ctx, int sock, struct lttng_trigger *trigger = NULL; uint64_t notification_counter = 1; - trigger_len = (size_t) cmd_ctx->lsm->u.trigger.header.len; + trigger_len = (size_t) cmd_ctx->lsm->u.trigger.length; trigger_buffer = zmalloc(trigger_len); if (!trigger_buffer) { ret = LTTNG_ERR_NOMEM; diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h index 90f7bfbe3..9978017c9 100644 --- a/src/common/sessiond-comm/sessiond-comm.h +++ b/src/common/sessiond-comm/sessiond-comm.h @@ -314,7 +314,7 @@ struct lttcomm_session_msg { uint32_t pid; } LTTNG_PACKED pid_tracker; struct { - struct lttng_trigger_comm header; + uint32_t length; } LTTNG_PACKED trigger; } u; } LTTNG_PACKED; diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c index 06e943d27..e26e7cbcb 100644 --- a/src/lib/lttng-ctl/lttng-ctl.c +++ b/src/lib/lttng-ctl/lttng-ctl.c @@ -2468,12 +2468,12 @@ int lttng_register_trigger(struct lttng_trigger *trigger) memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_REGISTER_TRIGGER; - lsm.u.trigger.header.len = (uint32_t) trigger_size; if (lttng_trigger_serialize(trigger, trigger_buf) < 0) { ret = -LTTNG_ERR_UNK; goto end; } + lsm.u.trigger.length = (uint32_t) trigger_size; ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(&lsm, trigger_buf, trigger_size, NULL); end: -- 2.34.1