X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=c9fb293be1ed74411d20238ec7f94663a613041e;hp=20bb8c6fa0d358c966ebfd3a9cd2e0a836330f3e;hb=18eace3ba4aeaa6b869c8ad9ec1273381b4cbdee;hpb=3e230f922d67f7a47b66631f7a8cf458002b3727

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 20bb8c6fa..c9fb293be 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -749,10 +749,10 @@ int lttng_stop_tracing_no_wait(const char *session_name)
 }
 
 /*
- * Add context to event and/or channel.
- * If event_name is NULL, the context is applied to all events of the channel.
- * If channel_name is NULL, a lookup of the event's channel is done.
- * If both are NULL, the context is applied to all events of all channels.
+ * Add context to a channel.
+ *
+ * If the given channel is NULL, add the contexts to all channels.
+ * The event_name param is ignored.
  *
  * Returns the size of the returned payload data or a negative error code.
  */
@@ -774,9 +774,6 @@ int lttng_add_context(struct lttng_handle *handle,
 	/* Copy channel name */
 	copy_string(lsm.u.context.channel_name, channel_name,
 			sizeof(lsm.u.context.channel_name));
-	/* Copy event name */
-	copy_string(lsm.u.context.event_name, event_name,
-			sizeof(lsm.u.context.event_name));
 
 	copy_lttng_domain(&lsm.domain, &handle->domain);
 
@@ -830,13 +827,13 @@ int lttng_enable_event(struct lttng_handle *handle,
 }
 
 /*
- * set filter for an event
+ * Set filter for an event
+ *
  * Return negative error value on error.
  * Return size of returned session payload data if OK.
  */
-
 int lttng_set_event_filter(struct lttng_handle *handle,
-		const char *event_name, const char *channel_name,
+		struct lttng_event *event, const char *channel_name,
 		const char *filter_expression)
 {
 	struct lttcomm_session_msg lsm;
@@ -930,8 +927,10 @@ int lttng_set_event_filter(struct lttng_handle *handle,
 	copy_string(lsm.u.filter.channel_name, channel_name,
 			sizeof(lsm.u.filter.channel_name));
 	/* Copy event name */
-	copy_string(lsm.u.filter.event_name, event_name,
-			sizeof(lsm.u.filter.event_name));
+	if (event) {
+		memcpy(&lsm.u.enable.event, event, sizeof(lsm.u.enable.event));
+	}
+
 	lsm.u.filter.bytecode_len = sizeof(ctx->bytecode->b)
 			+ bytecode_get_len(&ctx->bytecode->b);